diff --git a/writer/internal/config/config.go b/writer/internal/config/config.go index f295580..aa664de 100644 --- a/writer/internal/config/config.go +++ b/writer/internal/config/config.go @@ -1,7 +1,7 @@ package config var ( - Local = "writer" + Local = "storage" LogsDirectory string Cameras = "/home/psa/GoRepository/rtsp_reader-writer/writer/internal/config/cameras.yaml" ) diff --git a/writer/internal/ingest/rtsp/rtsp.go b/writer/internal/ingest/rtsp/rtsp.go index 836df61..3c3fdeb 100644 --- a/writer/internal/ingest/rtsp/rtsp.go +++ b/writer/internal/ingest/rtsp/rtsp.go @@ -241,22 +241,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -337,22 +331,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -462,22 +450,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -655,22 +637,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -800,22 +776,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -911,22 +881,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1000,22 +964,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1089,22 +1047,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1180,22 +1132,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1269,22 +1215,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1367,22 +1307,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } } @@ -1465,22 +1399,16 @@ func rtsp(dir string, period int, link string, number int) error { switch req.Method { case base.Teardown: cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) - log.Println("got TEARDOWN request from server: ", req.String()) case base.Method(rune(base.StatusRequestTimeout)): cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) - log.Println("got STATUS_REQUEST_TIMEOUT from server: ", req.String()) case base.GetParameter: cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) - log.Println("got Get_Parameter from server: ", req.String()) case "TCP timeout": cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) - log.Println("got TCP timeout from server: ", req.String()) case "EOF": cam.Warn("got EOF from server:", zap.String("request", req.String())) - log.Println("got EOF from server: ", req.String()) default: cam.Warn("got method from server:", zap.String("request", req.String())) - log.Println("got method from server: ", req.String()) } }