From 0aec0c483c22de5f91dec77e59564755e5536adb Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 6 Sep 2016 10:50:13 +0300
Subject: [PATCH] Cleanup early error logging

If the log file could not be opened, it was reported over and
over and over again to stderr.
---
 server/core/gateway.c      | 29 +++++++++++++----------------
 server/core/log_manager.cc |  9 +++------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/server/core/gateway.c b/server/core/gateway.c
index 168251857..ad75dbb0f 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -693,30 +693,27 @@ static void print_log_n_stderr(
     const char* fprstr,   /*< string to be printed to stderr */
     int         eno)      /*< errno, if it is set, zero, otherwise */
 {
-    char* log_err = "Error :";
-    char* fpr_err = "*\n* Error :";
-    char* fpr_end   = "\n*\n";
-
     if (do_log)
     {
-        mxs_log_init(NULL, get_logdir(), MXS_LOG_TARGET_FS);
-        char errbuf[STRERROR_BUFLEN];
-        MXS_ERROR("%s %s %s %s",
-                  log_err,
-                  logstr,
-                  eno == 0 ? " " : "Error :",
-                  eno == 0 ? " " : strerror_r(eno, errbuf, sizeof(errbuf)));
+        if (mxs_log_init(NULL, get_logdir(), MXS_LOG_TARGET_FS))
+        {
+            char errbuf[STRERROR_BUFLEN];
+            MXS_ERROR("%s%s%s%s",
+                      logstr,
+                      eno == 0 ? "" : " (",
+                      eno == 0 ? "" : strerror_r(eno, errbuf, sizeof(errbuf)),
+                      eno == 0 ? "" : ")");
+        }
     }
     if (do_stderr)
     {
         char errbuf[STRERROR_BUFLEN];
         fprintf(stderr,
-                "%s %s %s %s %s",
-                fpr_err,
+                "* Error: %s%s%s%s\n",
                 fprstr,
-                eno == 0 ? " " : "Error :",
-                eno == 0 ? " " : strerror_r(eno, errbuf, sizeof(errbuf)),
-                fpr_end);
+                eno == 0 ? "" : " (",
+                eno == 0 ? "" : strerror_r(eno, errbuf, sizeof(errbuf)),
+                eno == 0 ? "" : ")");
     }
 }
 
diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc
index f8c85eca3..e6e07ed99 100644
--- a/server/core/log_manager.cc
+++ b/server/core/log_manager.cc
@@ -443,7 +443,7 @@ return_succ:
     {
         /** This releases memory of all created objects */
         logmanager_done_nomutex();
-        fprintf(stderr, "*\n* Error : Initializing log manager failed.\n*\n");
+        fprintf(stderr, "* Error: Initializing the log manager failed.\n");
     }
     return succ;
 }
@@ -1566,7 +1566,7 @@ static bool logfile_open_file(filewriter_t* fw, logfile_t* lf)
 
     if (fw->fwr_file == NULL)
     {
-        fprintf(stderr, "Error : opening logfile %s failed.\n", lf->lf_full_file_name);
+        // Error logged by skygw_file_init to stderr.
         rv = false;
     }
 
@@ -2035,10 +2035,7 @@ static bool filewriter_init(logmanager_t* logmanager, filewriter_t* fw)
     }
     else
     {
-        fprintf(stderr,
-                "Error : opening log file %s failed. Exiting "
-                "MaxScale\n",
-                lf->lf_full_file_name);
+        // Error logged already to stderr.
         filewriter_done(fw);
     }