Merge branch 'develop'

machinery/src/components/Kerberos.go

@@ -115,14 +115,22 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	// Establishing the camera connection without backchannel if no substream
 	rtspUrl := config.Capture.IPCamera.RTSP
 	rtspClient := captureDevice.SetMainClient(rtspUrl)
-
-	err := rtspClient.Connect(context.Background())
-	if err != nil {
-		log.Log.Error("components.Kerberos.RunAgent(): error connecting to RTSP stream: " + err.Error())
-		rtspClient.Close()
+	if rtspUrl != "" {
+		err := rtspClient.Connect(context.Background())
+		if err != nil {
+			log.Log.Error("components.Kerberos.RunAgent(): error connecting to RTSP stream: " + err.Error())
+			rtspClient.Close()
+			rtspClient = nil
+			time.Sleep(time.Second * 3)
+			return status
+		}
+	} else {
+		log.Log.Error("components.Kerberos.RunAgent(): no rtsp url found in config, please provide one.")
+		rtspClient = nil
 		time.Sleep(time.Second * 3)
 		return status
 	}
+
 	log.Log.Info("components.Kerberos.RunAgent(): opened RTSP stream: " + rtspUrl)
 
 	// Get the video streams from the RTSP server.

snapcraft.yaml

@@ -1,6 +1,6 @@
 name: kerberosio # you probably want to 'snapcraft register <name>'
 base: core22 # the base snap is the execution environment for this snap
-version: '3.0.0' # just for humans, typically '1.2+git' or '1.3.2'
+version: '3.1.0' # just for humans, typically '1.2+git' or '1.3.2'
 summary: A stand-alone open source video surveillance system # 79 char long summary
 description: |
    Kerberos Agent is an isolated and scalable video (surveillance) management
@@ -19,5 +19,5 @@ apps:
     plugs: [ network, network-bind ]
 parts:
   agent:
-    source: . #https://github.com/kerberos-io/agent/releases/download/21c0e01/agent-amd64.tar
+    source: https://github.com/kerberos-io/agent/releases/download/21c0e01/agent-amd64.tar
     plugin: dump