diff --git a/machinery/src/capture/IPCamera.go b/machinery/src/capture/IPCamera.go
index c75afe0..44d3ba3 100644
--- a/machinery/src/capture/IPCamera.go
+++ b/machinery/src/capture/IPCamera.go
@@ -64,9 +64,7 @@ loop:
var pkt av.Packet
if pkt, err = infile.ReadPacket(); err != nil { // sometimes this throws an end of file..
log.Log.Error("HandleStream: " + err.Error())
- if err.Error() == "EOF" {
- time.Sleep(30 * time.Second)
- }
+ time.Sleep(1 * time.Second)
}
// Could be that a decode is throwing errors.
diff --git a/machinery/src/components/Kerberos.go b/machinery/src/components/Kerberos.go
index 71bc6c3..4b501fc 100644
--- a/machinery/src/components/Kerberos.go
+++ b/machinery/src/components/Kerberos.go
@@ -136,13 +136,10 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
status = <-communication.HandleBootstrap
// Here we are cleaning up everything!
- communication.HandleStream <- "stop"
-
if configuration.Config.Offline != "true" {
communication.HandleHeartBeat <- "stop"
communication.HandleUpload <- "stop"
}
-
infile.Close()
queue.Close()
close(communication.HandleONVIF)
@@ -150,10 +147,11 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
close(communication.HandleMotion)
routers.DisconnectMQTT(mqttClient)
decoder.Close()
+ communication.HandleStream <- "stop"
// Waiting for some seconds to make sure everything is properly closed.
- log.Log.Info("RunAgent: waiting 1 second to make sure everything is properly closed.")
- time.Sleep(time.Second * 1)
+ log.Log.Info("RunAgent: waiting 3 seconds to make sure everything is properly closed.")
+ time.Sleep(time.Second * 3)
} else {
log.Log.Error("Something went wrong while opening RTSP: " + err.Error())
time.Sleep(time.Second * 3)
diff --git a/ui/src/pages/Settings/Settings.jsx b/ui/src/pages/Settings/Settings.jsx
index 756e3cc..9ee20c5 100644
--- a/ui/src/pages/Settings/Settings.jsx
+++ b/ui/src/pages/Settings/Settings.jsx
@@ -1261,425 +1261,429 @@ class Settings extends React.Component {
- Sunday
-
+
Sunday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 0,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 0,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 0,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 0,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Monday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 1,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 1,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 1,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 1,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Monday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 1,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 1,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 1,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 1,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Tuesday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 2,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 2,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 2,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 2,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Tuesday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 2,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 2,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 2,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 2,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Wednesday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 3,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 3,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 3,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 3,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Wednesday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 3,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 3,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 3,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 3,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Thursday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 4,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 4,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 4,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 4,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Thursday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 4,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 4,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 4,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 4,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Friday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 5,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 5,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 5,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 5,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Friday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 5,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 5,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 5,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 5,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
-
Saturday
-
- {
- this.onUpdateTimeline(
- 'timetable',
- 6,
- 'start1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 6,
- 'end1',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 6,
- 'start2',
- event,
- config.timetable
- );
- }}
- />
- {
- this.onUpdateTimeline(
- 'timetable',
- 6,
- 'end2',
- event,
- config.timetable
- );
- }}
- />
-
+
Saturday
+
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 6,
+ 'start1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 6,
+ 'end1',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 6,
+ 'start2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+ {
+ this.onUpdateTimeline(
+ 'timetable',
+ 6,
+ 'end2',
+ event,
+ config.timetable
+ );
+ }}
+ />
+
+
+ )}
)}