Browse Source

print closing message before an object is closed

pull/745/head
aler9 4 years ago
parent
commit
7352244fd9
  1. 2
      internal/core/api.go
  2. 2
      internal/core/hls_server.go
  3. 2
      internal/core/metrics.go
  4. 2
      internal/core/pprof.go
  5. 2
      internal/core/rtmp_server.go
  6. 2
      internal/core/rtsp_server.go

2
internal/core/api.go

@ -239,8 +239,8 @@ func newAPI( @@ -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{}) {

2
internal/core/hls_server.go

@ -125,9 +125,9 @@ func (s *hlsServer) log(level logger.Level, format string, args ...interface{}) @@ -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() {

2
internal/core/metrics.go

@ -77,8 +77,8 @@ func newMetrics( @@ -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{}) {

2
internal/core/pprof.go

@ -48,8 +48,8 @@ func newPPROF( @@ -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{}) {

2
internal/core/rtmp_server.go

@ -128,9 +128,9 @@ func (s *rtmpServer) log(level logger.Level, format string, args ...interface{}) @@ -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() {

2
internal/core/rtsp_server.go

@ -188,9 +188,9 @@ func (s *rtspServer) log(level logger.Level, format string, args ...interface{}) @@ -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() {

Loading…
Cancel
Save