From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Sep 2015 19:19:55 +0000 (-0400)
Subject: pimd: Remove stdout zlog changes
X-Git-Tag: frr-2.0-rc1~849
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=18a232959d68f73526ee1b9f801e9c617f761e3f;p=mirror%2Ffrr.git

pimd: Remove stdout zlog changes

Quagga start has unnecessary pim messages to stdout.  Causing some confusion.
Logging is already saving this information in pimd.log

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index f5957b0a4d..96b784c2c8 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -186,12 +186,6 @@ int main(int argc, char** argv, char** envp) {
 
   master = thread_master_create();
 
-  /*
-   * Temporarily send zlog to stdout
-   */
-  zlog_default->maxlvl[ZLOG_DEST_STDOUT] = zlog_default->default_lvl;
-  zlog_notice("Boot logging temporarily directed to stdout - begin");
-
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting",
 	      QUAGGA_VERSION, PIMD_VERSION);
 
@@ -207,17 +201,7 @@ int main(int argc, char** argv, char** envp) {
   pim_init();
 
   /*
-   * reset zlog default, then will obey configuration file
-   */
-  zlog_notice("Boot logging temporarily directed to stdout - end");
-#if 0
-  /* this would disable logging to stdout, but config has not been
-     loaded yet to reconfig the logging output */
-  zlog_default->maxlvl[ZLOG_DEST_STDOUT] = ZLOG_DISABLED;
-#endif
-
-  /*
-    Initialize zclient "update" and "lookup" sockets
+   * Initialize zclient "update" and "lookup" sockets
    */
   pim_zebra_init(zebra_sock_path);