pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix changing log level with hot reloading or API (#2278)

pull/2279/head
Alessandro Ros 2 years ago committed by GitHub
parent
95baade478
commit
5a40a06e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      internal/core/core.go

35
internal/core/core.go
Unescape View File

@ -476,18 +476,20 @@ func (p *Core) createResources(initial bool) error {
func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) { func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
closeLogger := newConf == nil || closeLogger := newConf == nil ||
newConf.LogLevel != p.conf.LogLevel ||
!reflect.DeepEqual(newConf.LogDestinations, p.conf.LogDestinations) || !reflect.DeepEqual(newConf.LogDestinations, p.conf.LogDestinations) ||
newConf.LogFile != p.conf.LogFile newConf.LogFile != p.conf.LogFile
closeMetrics := newConf == nil || closeMetrics := newConf == nil ||
newConf.Metrics != p.conf.Metrics || newConf.Metrics != p.conf.Metrics ||
newConf.MetricsAddress != p.conf.MetricsAddress || newConf.MetricsAddress != p.conf.MetricsAddress ||
newConf.ReadTimeout != p.conf.ReadTimeout newConf.ReadTimeout != p.conf.ReadTimeout ||
closeLogger
closePPROF := newConf == nil || closePPROF := newConf == nil ||
newConf.PPROF != p.conf.PPROF || newConf.PPROF != p.conf.PPROF ||
newConf.PPROFAddress != p.conf.PPROFAddress || newConf.PPROFAddress != p.conf.PPROFAddress ||
newConf.ReadTimeout != p.conf.ReadTimeout newConf.ReadTimeout != p.conf.ReadTimeout ||
closeLogger
closePathManager := newConf == nil || closePathManager := newConf == nil ||
newConf.ExternalAuthenticationURL != p.conf.ExternalAuthenticationURL || newConf.ExternalAuthenticationURL != p.conf.ExternalAuthenticationURL ||
@ -497,7 +499,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.WriteTimeout != p.conf.WriteTimeout || newConf.WriteTimeout != p.conf.WriteTimeout ||
newConf.WriteQueueSize != p.conf.WriteQueueSize || newConf.WriteQueueSize != p.conf.WriteQueueSize ||
newConf.UDPMaxPayloadSize != p.conf.UDPMaxPayloadSize || newConf.UDPMaxPayloadSize != p.conf.UDPMaxPayloadSize ||
closeMetrics closeMetrics ||
closeLogger
if !closePathManager && !reflect.DeepEqual(newConf.Paths, p.conf.Paths) { if !closePathManager && !reflect.DeepEqual(newConf.Paths, p.conf.Paths) {
p.pathManager.confReload(newConf.Paths) p.pathManager.confReload(newConf.Paths)
} }
@ -521,7 +524,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.RunOnConnect != p.conf.RunOnConnect || newConf.RunOnConnect != p.conf.RunOnConnect ||
newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart || newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart ||
closeMetrics || closeMetrics ||
closePathManager closePathManager ||
closeLogger
closeRTSPSServer := newConf == nil || closeRTSPSServer := newConf == nil ||
newConf.RTSP != p.conf.RTSP || newConf.RTSP != p.conf.RTSP ||
@ -538,7 +542,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.RunOnConnect != p.conf.RunOnConnect || newConf.RunOnConnect != p.conf.RunOnConnect ||
newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart || newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart ||
closeMetrics || closeMetrics ||
closePathManager closePathManager ||
closeLogger
closeRTMPServer := newConf == nil || closeRTMPServer := newConf == nil ||
newConf.RTMP != p.conf.RTMP || newConf.RTMP != p.conf.RTMP ||
@ -551,7 +556,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.RunOnConnect != p.conf.RunOnConnect || newConf.RunOnConnect != p.conf.RunOnConnect ||
newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart || newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart ||
closeMetrics || closeMetrics ||
closePathManager closePathManager ||
closeLogger
closeRTMPSServer := newConf == nil || closeRTMPSServer := newConf == nil ||
newConf.RTMP != p.conf.RTMP || newConf.RTMP != p.conf.RTMP ||
@ -566,7 +572,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.RunOnConnect != p.conf.RunOnConnect || newConf.RunOnConnect != p.conf.RunOnConnect ||
newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart || newConf.RunOnConnectRestart != p.conf.RunOnConnectRestart ||
closeMetrics || closeMetrics ||
closePathManager closePathManager ||
closeLogger
closeHLSManager := newConf == nil || closeHLSManager := newConf == nil ||
newConf.HLS != p.conf.HLS || newConf.HLS != p.conf.HLS ||
@ -587,7 +594,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.ReadTimeout != p.conf.ReadTimeout || newConf.ReadTimeout != p.conf.ReadTimeout ||
newConf.WriteQueueSize != p.conf.WriteQueueSize || newConf.WriteQueueSize != p.conf.WriteQueueSize ||
closePathManager || closePathManager ||
closeMetrics closeMetrics ||
closeLogger
closeWebRTCManager := newConf == nil || closeWebRTCManager := newConf == nil ||
newConf.WebRTC != p.conf.WebRTC || newConf.WebRTC != p.conf.WebRTC ||
@ -604,7 +612,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.WebRTCICEUDPMuxAddress != p.conf.WebRTCICEUDPMuxAddress || newConf.WebRTCICEUDPMuxAddress != p.conf.WebRTCICEUDPMuxAddress ||
newConf.WebRTCICETCPMuxAddress != p.conf.WebRTCICETCPMuxAddress || newConf.WebRTCICETCPMuxAddress != p.conf.WebRTCICETCPMuxAddress ||
closeMetrics || closeMetrics ||
closePathManager closePathManager ||
closeLogger
closeSRTServer := newConf == nil || closeSRTServer := newConf == nil ||
newConf.SRT != p.conf.SRT || newConf.SRT != p.conf.SRT ||
@ -613,7 +622,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
newConf.WriteTimeout != p.conf.WriteTimeout || newConf.WriteTimeout != p.conf.WriteTimeout ||
newConf.WriteQueueSize != p.conf.WriteQueueSize || newConf.WriteQueueSize != p.conf.WriteQueueSize ||
newConf.UDPMaxPayloadSize != p.conf.UDPMaxPayloadSize || newConf.UDPMaxPayloadSize != p.conf.UDPMaxPayloadSize ||
closePathManager closePathManager ||
closeLogger
closeAPI := newConf == nil || closeAPI := newConf == nil ||
newConf.API != p.conf.API || newConf.API != p.conf.API ||
@ -625,7 +635,8 @@ func (p *Core) closeResources(newConf *conf.Conf, calledByAPI bool) {
closeRTMPServer || closeRTMPServer ||
closeHLSManager || closeHLSManager ||
closeWebRTCManager || closeWebRTCManager ||
closeSRTServer closeSRTServer ||
closeLogger
if newConf == nil && p.confWatcher != nil { if newConf == nil && p.confWatcher != nil {
p.confWatcher.Close() p.confWatcher.Close()

Write Preview
Loading…
Cancel
Save