Merge pull request #40 from riccardobiraghi/issue37

Replace logDebug with log.Debug
This commit is contained in:
Arthur Barr
2018-04-09 16:38:23 +01:00
committed by GitHub
2 changed files with 4 additions and 12 deletions

View File

@@ -31,14 +31,6 @@ import (
// var debug = false
var log *logger.Logger
func logDebug(args ...interface{}) {
log.Debug(args)
}
func logDebugf(format string, args ...interface{}) {
log.Debugf(format, args...)
}
func logTerminationf(format string, args ...interface{}) {
logTermination(fmt.Sprintf(format, args))
}
@@ -74,7 +66,7 @@ func mirrorQueueManagerErrorLogs(ctx context.Context, wg *sync.WaitGroup, name s
// Always use the JSON log as the source
qm, err := mqini.GetQueueManager(name)
if err != nil {
logDebug(err)
log.Debug(err)
return nil, err
}
f := filepath.Join(mqini.GetErrorLogDirectory(qm), "AMQERR01.json")

View File

@@ -49,13 +49,13 @@ func signalHandler(qmgr string) chan int {
// End the goroutine
return
case <-reapSignals:
logDebug("Received SIGCHLD signal")
log.Debug("Received SIGCHLD signal")
reapZombies()
case job := <-control:
switch {
case job == startReaping:
// Add SIGCHLD to the list of signals we're listening to
logDebug("Listening for SIGCHLD signals")
log.Debug("Listening for SIGCHLD signals")
signal.Notify(reapSignals, syscall.SIGCHLD)
case job == reapNow:
reapZombies()
@@ -76,6 +76,6 @@ func reapZombies() {
if pid == 0 || err == unix.ECHILD {
return
}
logDebugf("Reaped PID %v", pid)
log.Debugf("Reaped PID %v", pid)
}
}