Browse Source

align listener opened / closed messages

pull/707/head
aler9 4 years ago
parent
commit
02291f552a
  1. 3
      internal/core/api.go
  2. 2
      internal/core/hls_server.go
  3. 15
      internal/core/metrics.go
  4. 12
      internal/core/pprof.go
  5. 2
      internal/core/rtmp_server.go
  6. 2
      internal/core/rtsp_server.go

3
internal/core/api.go

@ -240,10 +240,9 @@ func newAPI( @@ -240,10 +240,9 @@ func newAPI(
func (a *api) close() {
a.s.Shutdown(context.Background())
a.log(logger.Info, "closed")
a.log(logger.Info, "listener closed")
}
// Log is the main logging function.
func (a *api) log(level logger.Level, format string, args ...interface{}) {
a.parent.Log(level, "[API] "+format, args...)
}

2
internal/core/hls_server.go

@ -127,7 +127,7 @@ func (s *hlsServer) log(level logger.Level, format string, args ...interface{}) @@ -127,7 +127,7 @@ func (s *hlsServer) log(level logger.Level, format string, args ...interface{})
func (s *hlsServer) close() {
s.ctxCancel()
s.wg.Wait()
s.log(logger.Info, "closed")
s.log(logger.Info, "listener closed")
}
func (s *hlsServer) run() {

15
internal/core/metrics.go

@ -38,9 +38,10 @@ type metricsParent interface { @@ -38,9 +38,10 @@ type metricsParent interface {
}
type metrics struct {
ln net.Listener
server *http.Server
parent metricsParent
ln net.Listener
server *http.Server
mutex sync.Mutex
pathManager metricsPathManager
rtspServer metricsRTSPServer
@ -59,7 +60,8 @@ func newMetrics( @@ -59,7 +60,8 @@ func newMetrics(
}
m := &metrics{
ln: ln,
parent: parent,
ln: ln,
}
router := gin.New()
@ -67,7 +69,7 @@ func newMetrics( @@ -67,7 +69,7 @@ func newMetrics(
m.server = &http.Server{Handler: router}
parent.Log(logger.Info, "[metrics] opened on "+address)
m.log(logger.Info, "listener opened on "+address)
go m.run()
@ -76,6 +78,11 @@ func newMetrics( @@ -76,6 +78,11 @@ func newMetrics(
func (m *metrics) close() {
m.server.Shutdown(context.Background())
m.log(logger.Info, "listener closed")
}
func (m *metrics) log(level logger.Level, format string, args ...interface{}) {
m.parent.Log(level, "[metrics] "+format, args...)
}
func (m *metrics) run() {

12
internal/core/pprof.go

@ -16,6 +16,8 @@ type pprofParent interface { @@ -16,6 +16,8 @@ type pprofParent interface {
}
type pprof struct {
parent pprofParent
ln net.Listener
server *http.Server
}
@ -30,14 +32,15 @@ func newPPROF( @@ -30,14 +32,15 @@ func newPPROF(
}
pp := &pprof{
ln: ln,
parent: parent,
ln: ln,
}
pp.server = &http.Server{
Handler: http.DefaultServeMux,
}
parent.Log(logger.Info, "[pprof] opened on "+address)
pp.log(logger.Info, "listener opened on "+address)
go pp.run()
@ -46,6 +49,11 @@ func newPPROF( @@ -46,6 +49,11 @@ func newPPROF(
func (pp *pprof) close() {
pp.server.Shutdown(context.Background())
pp.log(logger.Info, "listener closed")
}
func (pp *pprof) log(level logger.Level, format string, args ...interface{}) {
pp.parent.Log(level, "[pprof] "+format, args...)
}
func (pp *pprof) run() {

2
internal/core/rtmp_server.go

@ -126,7 +126,7 @@ func (s *rtmpServer) log(level logger.Level, format string, args ...interface{}) @@ -126,7 +126,7 @@ func (s *rtmpServer) log(level logger.Level, format string, args ...interface{})
func (s *rtmpServer) close() {
s.ctxCancel()
s.wg.Wait()
s.log(logger.Info, "closed")
s.log(logger.Info, "listener closed")
}
func (s *rtmpServer) run() {

2
internal/core/rtsp_server.go

@ -186,7 +186,7 @@ func (s *rtspServer) log(level logger.Level, format string, args ...interface{}) @@ -186,7 +186,7 @@ func (s *rtspServer) log(level logger.Level, format string, args ...interface{})
func (s *rtspServer) close() {
s.ctxCancel()
s.wg.Wait()
s.log(logger.Info, "closed")
s.log(logger.Info, "listener closed")
}
func (s *rtspServer) run() {

Loading…
Cancel
Save