From ef0494903608eb5719e750586be7283117fb1fa5 Mon Sep 17 00:00:00 2001
From: Riccardo Biraghi <riccardo.biraghi@ibm.com>
Date: Mon, 9 Apr 2018 12:45:45 +0100
Subject: [PATCH] Replace logDebug with log.Debug

---
 cmd/runmqserver/logging.go | 10 +---------
 cmd/runmqserver/signals.go |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cmd/runmqserver/logging.go b/cmd/runmqserver/logging.go
index 9538ab9..0acb9fd 100644
--- a/cmd/runmqserver/logging.go
+++ b/cmd/runmqserver/logging.go
@@ -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")
diff --git a/cmd/runmqserver/signals.go b/cmd/runmqserver/signals.go
index 91c1789..c7a2e79 100644
--- a/cmd/runmqserver/signals.go
+++ b/cmd/runmqserver/signals.go
@@ -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)
 	}
 }