Log config when debug-level

This commit is contained in:
2021-09-19 05:49:23 +02:00
parent bc02653473
commit 66aea2f30b
4 changed files with 31 additions and 19 deletions

View File

@@ -66,24 +66,25 @@ func ActionServe(c *cli.Context) error {
}
// Setup proper logger
logger = setupServerLogger(cfg.LogLevel)
cfg.DebugLog(logger)
ctx, cancel := context.WithCancel(context.Background())
// Setup RTMP-server
s := server.NewRTMPServer(ctx, cfg.RTMPListenAddr)
s.Logger = logger
s.Hostname = cfg.Hostname
rtmpServer := server.NewRTMPServer(ctx, cfg.RTMPListenAddr)
rtmpServer.Logger = logger
rtmpServer.Hostname = cfg.Hostname
// Setup web-server
webDone := make(chan struct{})
if cfg.HTTPServerEnable {
ws := server.NewWebServer(ctx, s)
ws := server.NewWebServer(ctx, rtmpServer)
ws.ListenAddr = cfg.HTTPListenAddr
ws.Logger = logger
go func() {
s.Logger.Infow("Starting HTTP server.", "listen_addr", ws.ListenAddr)
rtmpServer.Logger.Infow("Starting HTTP server.", "listen_addr", ws.ListenAddr)
err := ws.Serve()
if err != nil && err != http.ErrServerClosed {
s.Logger.Infow("HTTP server shut down with error.", "err", err)
rtmpServer.Logger.Infow("HTTP server shut down with error.", "err", err)
}
close(webDone)
}()
@@ -95,19 +96,19 @@ func ActionServe(c *cli.Context) error {
signal.Notify(sigChan, os.Interrupt)
go func() {
<-sigChan
s.Logger.Debug("Got shutdown signal.")
rtmpServer.Logger.Debug("Got shutdown signal.")
cancel()
}()
// Start RTMP-server
s.Logger.Infow("Starting RTMP server.", "listen_addr", s.ListenAddr)
if err := s.Listen(); err != nil {
rtmpServer.Logger.Infow("Starting RTMP server.", "listen_addr", s.ListenAddr)
if err := rtmpServer.Listen(); err != nil {
return cli.Exit(err, ExitGenericError)
}
// Wait for webserver to exit, if started
<-webDone
s.Logger.Info("Server shut down.")
rtmpServer.Logger.Info("Server shut down.")
return nil
}