From da2de5b35ab15b0aac5885bf7c0c750d70e09f03 Mon Sep 17 00:00:00 2001 From: richard-austin Date: Mon, 14 Aug 2023 17:54:40 +0100 Subject: [PATCH] Change log.Fatalln to log.Errorln in http.go as it's not a fatal error there --- src/cameras.json | 9 +-------- src/http.go | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/cameras.json b/src/cameras.json index 28539d8..b76b354 100644 --- a/src/cameras.json +++ b/src/cameras.json @@ -5,16 +5,9 @@ "stream1": { "audio_bitrate": "8000", "descr": "HD", - "netcam_uri": "rtsp://192.168.1.21:554/11", + "netcam_uri": "rtsp://192.168.1.29:554/11", "client_uri": "http://localhost:8081/live/stream?suuid=stream1", "uri": "http://localhost:8081/ws/stream/suuid=stream1" - }, - "stream2": { - "audio_bitrate": "0", - "descr": "SD", - "netcam_uri": "rtsp://192.168.1.21:554/12", - "client_uri": "http://localhost:8081/live/stream?suuid=stream2", - "uri": "http://localhost:8081/ws/stream/suuid=stream2" } } } diff --git a/src/http.go b/src/http.go index affdda3..931ce89 100644 --- a/src/http.go +++ b/src/http.go @@ -17,7 +17,7 @@ var streams = NewStreams() ReadBox Sometimes the ftyp and moov atoms at the start of the stream from ffmpeg are combined in one packet. This function separates them if this occurs, so they can be put in their respective places and the moov - atom analyes to get the codec data. THis is only used to handle those first two messages. From then on it doesn't + atom analysis to get the codec data. THis is only used to handle those first two messages. From then on it doesn't matter if messages get appended to each other as they are going straight to mse (or ffmpeg for recordings) */ @@ -183,7 +183,7 @@ func serveHTTP() { addr := fmt.Sprintf(":%d", config.ServerPort) err := router.Run(addr) if err != nil { - log.Fatalln(err) + log.Errorln(err) } }