From f32d69a93d355f23e0b35f88ccd19e033bbc6243 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sun, 17 Oct 2021 17:16:57 +0200 Subject: [PATCH] fix race condition --- internal/core/api.go | 1 - internal/core/core.go | 3 +++ internal/core/hls_server.go | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/core/api.go b/internal/core/api.go index 7c06278a..ff69e3c6 100644 --- a/internal/core/api.go +++ b/internal/core/api.go @@ -297,7 +297,6 @@ func newAPI( parent: parent, } - gin.SetMode(gin.ReleaseMode) router := gin.New() router.NoRoute(a.mwLog) group := router.Group("/", a.mwLog) diff --git a/internal/core/core.go b/internal/core/core.go index 6cedc6da..7ae9acff 100644 --- a/internal/core/core.go +++ b/internal/core/core.go @@ -7,6 +7,7 @@ import ( "reflect" "sync/atomic" + "github.com/gin-gonic/gin" "gopkg.in/alecthomas/kingpin.v2" "github.com/aler9/rtsp-simple-server/internal/conf" @@ -64,6 +65,8 @@ func New(args []string) (*Core, bool) { // do not check for errors rlimit.Raise() + gin.SetMode(gin.ReleaseMode) + ctx, ctxCancel := context.WithCancel(context.Background()) p := &Core{ diff --git a/internal/core/hls_server.go b/internal/core/hls_server.go index dd1f8fd4..428de2fc 100644 --- a/internal/core/hls_server.go +++ b/internal/core/hls_server.go @@ -100,7 +100,6 @@ func (s *hlsServer) close() { func (s *hlsServer) run() { defer s.wg.Done() - gin.SetMode(gin.ReleaseMode) router := gin.New() router.NoRoute(s.onRequest)