psa/rtsp_reader-writer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring.

Browse Source
This commit is contained in:
Сергей Петров 2025-03-27 10:57:33 +05:00
parent 6b15e0f4ae
commit 14b5a9085f
2 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
writer/internal/config/config.go
View File

@ -1,7 +1,7 @@
package config package config
var ( var (
Local = "writer" Local = "storage"
LogsDirectory string LogsDirectory string
Cameras = "/home/psa/GoRepository/rtsp_reader-writer/writer/internal/config/cameras.yaml" Cameras = "/home/psa/GoRepository/rtsp_reader-writer/writer/internal/config/cameras.yaml"
) )

72
writer/internal/ingest/rtsp/rtsp.go
View File

@ -241,22 +241,16 @@ func rtsp(dir string, period int, link string, number int) error {
switch req.Method { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) 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 { switch req.Method {
case base.Teardown: case base.Teardown:
cam.Warn("got TEARDOWN request from server:", zap.String("request", req.String())) 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)): case base.Method(rune(base.StatusRequestTimeout)):
cam.Warn("got STATUS_REQUEST_TIMEOUT from server:", zap.String("request", req.String())) 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: case base.GetParameter:
cam.Info("got Get_Parameter from server:", zap.String("request", req.String())) cam.Info("got Get_Parameter from server:", zap.String("request", req.String()))
log.Println("got Get_Parameter from server: ", req.String())
case "TCP timeout": case "TCP timeout":
cam.Warn("got TCP timeout from server:", zap.String("request", req.String())) cam.Warn("got TCP timeout from server:", zap.String("request", req.String()))
log.Println("got TCP timeout from server: ", req.String())
case "EOF": case "EOF":
cam.Warn("got EOF from server:", zap.String("request", req.String())) cam.Warn("got EOF from server:", zap.String("request", req.String()))
log.Println("got EOF from server: ", req.String())
default: default:
cam.Warn("got method from server:", zap.String("request", req.String())) cam.Warn("got method from server:", zap.String("request", req.String()))
log.Println("got method from server: ", req.String())
} }
} }