zabbix/zabbix-agent2-plugin-onvif
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 判断 conn 是否存在，防止 NOP

Browse Source
This commit is contained in:
Liam Chan 2024-08-22 13:44:00 +08:00
parent 9a595fa997
commit 93bc5e80c4
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -12,13 +12,17 @@ func main() {
if err := config.LoadConfig(); err != nil { if err := config.LoadConfig(); err != nil {
log.Fatalf("Error loading config: %v", err) log.Fatalf("Error loading config: %v", err)
} }
addr := fmt.Sprintf("%s:%d", config.Conf.Server.Host, config.Conf.Server.Port)
r := gin.Default() r := gin.Default()
router.SetupRoutes(r) router.SetupRoutes(r)
addr := fmt.Sprintf("%s:%d", config.Conf.Server.Host, config.Conf.Server.Port) go func() {
if err := r.Run(addr); err != nil { err := r.Run(addr)
fmt.Println("Failed to start server:", err) if err != nil {
} fmt.Println("Failed to start server:", err)
}
}()
select {}
} }

11
router/handler/onvif/subscription.go
View File

@ -14,7 +14,16 @@ func CreateEventSubscription(c *gin.Context) {
xaddr := c.Param("xaddr") xaddr := c.Param("xaddr")
callbackURL := event.AttributedURIType(fmt.Sprintf("%s/onvif/subscriptions/%s/callback", config.Conf.App.URL, xaddr)) callbackURL := event.AttributedURIType(fmt.Sprintf("%s/onvif/subscriptions/%s/callback", config.Conf.App.URL, xaddr))
log.Printf("CreateEventSubscription callback URL: %s", callbackURL) log.Printf("CreateEventSubscription callback URL: %s", callbackURL)
result, err := conns[xaddr].SubscribeEvents(callbackURL, "PT60S")
conn := conns[xaddr]
if conn == nil {
c.JSON(http.StatusNotFound, gin.H{
"message": "Connection not found",
})
return
}
result, err := conn.SubscribeEvents(callbackURL, "PT60S")
if err != nil { if err != nil {
c.JSON(http.StatusServiceUnavailable, gin.H{ c.JSON(http.StatusServiceUnavailable, gin.H{
"message": err.Error(), "message": err.Error(),