Update to use LOG_FORMAT environment variable

2018-02-22 13:21:16 +00:00
parent c9cc1741c7
commit b497a04dcb
7 changed files with 70 additions and 38 deletions
--- a/cmd/runmqserver/main.go
+++ b/cmd/runmqserver/main.go
@@ -30,9 +30,13 @@ import (
 )

 func doMain() error {
-	configureLogger()
+	mf, err := configureLogger()
+	if err != nil {
+		logTermination(err)
+		return err
+	}
 	configureDebugLogger()
-	err := ready.Clear()
+	err = ready.Clear()
 	if err != nil {
 		logTermination(err)
 		return err
@@ -83,7 +87,7 @@ func doMain() error {
 		cancelMirror()
 	}()
 	// TODO: Use the error channel
-	_, err = mirrorLogs(ctx, &wg, name, newQM)
+	_, err = mirrorLogs(ctx, &wg, name, newQM, mf)
 	if err != nil {
 		logTermination(err)
 		return err