From 7352244fd9d61b16bdb1a8b4804aab7128aa6677 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Wed, 22 Dec 2021 00:15:15 +0100
Subject: [PATCH] print closing message before an object is closed

---
 internal/core/api.go         | 2 +-
 internal/core/hls_server.go  | 2 +-
 internal/core/metrics.go     | 2 +-
 internal/core/pprof.go       | 2 +-
 internal/core/rtmp_server.go | 2 +-
 internal/core/rtsp_server.go | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/core/api.go b/internal/core/api.go
index 2dfdb211..e7a35897 100644
--- a/internal/core/api.go
+++ b/internal/core/api.go
@@ -239,8 +239,8 @@ func newAPI(
 }
 
 func (a *api) close() {
+	a.log(logger.Info, "listener is closing")
 	a.s.Shutdown(context.Background())
-	a.log(logger.Info, "listener closed")
 }
 
 func (a *api) log(level logger.Level, format string, args ...interface{}) {
diff --git a/internal/core/hls_server.go b/internal/core/hls_server.go
index f1d0411e..dea4450b 100644
--- a/internal/core/hls_server.go
+++ b/internal/core/hls_server.go
@@ -125,9 +125,9 @@ func (s *hlsServer) log(level logger.Level, format string, args ...interface{})
 }
 
 func (s *hlsServer) close() {
+	s.log(logger.Info, "listener is closing")
 	s.ctxCancel()
 	s.wg.Wait()
-	s.log(logger.Info, "listener closed")
 }
 
 func (s *hlsServer) run() {
diff --git a/internal/core/metrics.go b/internal/core/metrics.go
index 586b1b55..3dcd2d81 100644
--- a/internal/core/metrics.go
+++ b/internal/core/metrics.go
@@ -77,8 +77,8 @@ func newMetrics(
 }
 
 func (m *metrics) close() {
+	m.log(logger.Info, "listener is closing")
 	m.server.Shutdown(context.Background())
-	m.log(logger.Info, "listener closed")
 }
 
 func (m *metrics) log(level logger.Level, format string, args ...interface{}) {
diff --git a/internal/core/pprof.go b/internal/core/pprof.go
index 9015d81f..89a206c1 100644
--- a/internal/core/pprof.go
+++ b/internal/core/pprof.go
@@ -48,8 +48,8 @@ func newPPROF(
 }
 
 func (pp *pprof) close() {
+	pp.log(logger.Info, "listener is closing")
 	pp.server.Shutdown(context.Background())
-	pp.log(logger.Info, "listener closed")
 }
 
 func (pp *pprof) log(level logger.Level, format string, args ...interface{}) {
diff --git a/internal/core/rtmp_server.go b/internal/core/rtmp_server.go
index 7b7113d8..367b9c36 100644
--- a/internal/core/rtmp_server.go
+++ b/internal/core/rtmp_server.go
@@ -128,9 +128,9 @@ func (s *rtmpServer) log(level logger.Level, format string, args ...interface{})
 }
 
 func (s *rtmpServer) close() {
+	s.log(logger.Info, "listener is closing")
 	s.ctxCancel()
 	s.wg.Wait()
-	s.log(logger.Info, "listener closed")
 }
 
 func (s *rtmpServer) run() {
diff --git a/internal/core/rtsp_server.go b/internal/core/rtsp_server.go
index ac1ff733..7604640a 100644
--- a/internal/core/rtsp_server.go
+++ b/internal/core/rtsp_server.go
@@ -188,9 +188,9 @@ func (s *rtspServer) log(level logger.Level, format string, args ...interface{})
 }
 
 func (s *rtspServer) close() {
+	s.log(logger.Info, "listener is closing")
 	s.ctxCancel()
 	s.wg.Wait()
-	s.log(logger.Info, "listener closed")
 }
 
 func (s *rtspServer) run() {