Kaynağa Gözat

Avoid logging startup messages twice

Sebastian Hahn 9 yıl önce
ebeveyn
işleme
6d8b614729
2 değiştirilmiş dosya ile 10 ekleme ve 0 silme
  1. 4 0
      changes/bug13993
  2. 6 0
      src/common/log.c

+ 4 - 0
changes/bug13993

@@ -0,0 +1,4 @@
+   o Minor bugfixes (logging):
+       - Don't log messages to stdout twice when starting up. Fixes bug
+         13993; bugfix on 0.2.6.1-alpha.
+

+ 6 - 0
src/common/log.c

@@ -1062,6 +1062,12 @@ flush_log_messages_from_startup(void)
       if (! logfile_wants_message(lf, msg->severity, msg->domain))
         continue;
 
+      /* We configure a temporary startup log that goes to stdout, so we
+       * shouldn't replay to stdout/stderr*/
+      if (lf->fd == STDOUT_FILENO || lf->fd == STDERR_FILENO) {
+        continue;
+      }
+
       logfile_deliver(lf, msg->fullmsg, strlen(msg->fullmsg), msg->msg,
                       msg->domain, msg->severity, &callbacks_deferred);
     }