From 2caa9b39575933ec86f5ff54ceb83b3c4460518a Mon Sep 17 00:00:00 2001
From: Don Slice <dslice@cumulusnetworks.com>
Date: Mon, 11 Jul 2016 12:57:24 -0700
Subject: [PATCH] all: add default log file if none are defined

Added a default log file named /var/log/quagga/Quagga.log to every daemon
to capture log entries if no log file is defined.  This also allows the
capture of logged information prior to reading each daemon's config file.
If a log file is defined manually, it will override this default file name.

Ticket: CM-10987
Signed-off-by: Don Slice
Reviewed By: Donald Sharp
Testing Done: Manual testing
---
 bgpd/bgp_main.c           | 3 ++-
 isisd/isis_main.c         | 3 ++-
 lib/log.h                 | 2 ++
 ospf6d/ospf6_main.c       | 2 ++
 ospfd/ospf_main.c         | 3 ++-
 pimd/pim_main.c           | 5 ++---
 ripd/rip_main.c           | 3 ++-
 ripngd/ripng_main.c       | 3 ++-
 watchquagga/watchquagga.c | 2 ++
 zebra/main.c              | 5 ++---
 10 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index f873aba493..1f2f7f86ce 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -407,6 +407,8 @@ main (int argc, char **argv)
 
   zlog_default = openzlog (progname, ZLOG_BGP, 0,
 			   LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zprivs_init (&bgpd_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   /* BGP master init. */
   bgp_master_init ();
@@ -492,7 +494,6 @@ main (int argc, char **argv)
   /* Initializations. */
   srandom (time (NULL));
   signal_init (bm->master, array_size(bgp_signals), bgp_signals);
-  zprivs_init (&bgpd_privs);
   cmd_init (1);
   vty_init (bm->master);
   memory_init ();
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 343c683f48..f088bc1dec 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -244,6 +244,8 @@ main (int argc, char **argv, char **envp)
 
   zlog_default = openzlog (progname, ZLOG_ISIS, 0,
 			   LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
+  zprivs_init (&isisd_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME , zlog_default->default_lvl);
 
   /* for reload */
   _argc = argc;
@@ -332,7 +334,6 @@ main (int argc, char **argv, char **envp)
   /*
    *  initializations
    */
-  zprivs_init (&isisd_privs);
   signal_init (master, array_size (isisd_signals), isisd_signals);
   cmd_init (1);
   vty_init (master);
diff --git a/lib/log.h b/lib/log.h
index 882080760d..951fa124c8 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -188,6 +188,8 @@ struct timestamp_control {
    char buf[QUAGGA_TIMESTAMP_LEN];	/* will contain the rendered timestamp */
 };
 
+#define LOG_DEFAULT_FILENAME "/var/log/quagga/Quagga.log"
+
 /* Defines for use in command construction: */
 
 #define LOG_LEVELS "(emergencies|alerts|critical|errors|warnings|notifications|informational|debugging)"
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 84c98b885f..c989a5a10a 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -321,6 +321,8 @@ main (int argc, char *argv[], char *envp[])
                            LOG_CONS|LOG_NDELAY|LOG_PID,
                            LOG_DAEMON);
   zprivs_init (&ospf6d_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
+
   /* initialize zebra libraries */
   signal_init (master, array_size(ospf6_signals), ospf6_signals);
   cmd_init (1);
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 62eb41e770..495ee2fd02 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -287,6 +287,8 @@ main (int argc, char **argv)
 
   zlog_default = openzlog (progname, ZLOG_OSPF, instance,
 			   LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zprivs_init (&ospfd_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   /* OSPF master init. */
   ospf_master_init ();
@@ -295,7 +297,6 @@ main (int argc, char **argv)
   master = om->master;
 
   /* Library inits. */
-  zprivs_init (&ospfd_privs);
   signal_init (master, array_size(ospf_signals), ospf_signals);
   cmd_init (1);
   debug_init ();
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 0746b864aa..b28b3d6242 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -137,8 +137,8 @@ int main(int argc, char** argv, char** envp) {
 
   zlog_default = openzlog(progname, ZLOG_PIM, 0,
 			  LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
-  zlog_set_file (NULL, "/var/log/quagga/Quagga.log",
-		 zlog_default->default_lvl);
+  zprivs_init (&pimd_privs);
+  zlog_set_file (NULL,  LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   /* this while just reads the options */                       
   while (1) {
@@ -197,7 +197,6 @@ int main(int argc, char** argv, char** envp) {
   /* 
    * Initializations
    */
-  zprivs_init (&pimd_privs);
   pim_signals_init();
   cmd_init(1);
   vty_init(master);
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index a5ea36a1f1..f920e809e2 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -204,6 +204,8 @@ main (int argc, char **argv)
   /* First of all we need logging init. */
   zlog_default = openzlog (progname, ZLOG_RIP, 0,
 			   LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zprivs_init (&ripd_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   /* Command line option parse. */
   while (1) 
@@ -275,7 +277,6 @@ main (int argc, char **argv)
   master = thread_master_create ();
 
   /* Library initialization. */
-  zprivs_init (&ripd_privs);
   signal_init (master, array_size(ripd_signals), ripd_signals);
   cmd_init (1);
   vty_init (master);
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index c05da0c9ef..a1c71c8562 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -203,6 +203,8 @@ main (int argc, char **argv)
 
   zlog_default = openzlog(progname, ZLOG_RIPNG, 0,
 			  LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zprivs_init (&ripngd_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   while (1) 
     {
@@ -272,7 +274,6 @@ main (int argc, char **argv)
   master = thread_master_create ();
 
   /* Library inits. */
-  zprivs_init (&ripngd_privs);
   signal_init (master, array_size(ripng_signals), ripng_signals);
   cmd_init (1);
   vty_init (master);
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index e882653e38..2a237efb6a 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1337,6 +1337,8 @@ main(int argc, char **argv)
 
   zlog_default = openzlog(progname, ZLOG_NONE, 0,
 			  LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zlog_set_file (NULL,  LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
+
   zlog_set_level(NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
   if (daemon_mode)
     {
diff --git a/zebra/main.c b/zebra/main.c
index fe48735506..ab907f83e8 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -244,6 +244,8 @@ main (int argc, char **argv)
 
   zlog_default = openzlog (progname, ZLOG_ZEBRA, 0,
 			   LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+  zprivs_init (&zserv_privs);
+  zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
 
   while (1) 
     {
@@ -330,9 +332,6 @@ main (int argc, char **argv)
   /* Make master thread emulator. */
   zebrad.master = thread_master_create ();
 
-  /* privs initialise */
-  zprivs_init (&zserv_privs);
-
   /* Vty related initialize. */
   signal_init (zebrad.master, array_size(zebra_signals), zebra_signals);
   cmd_init (1);
-- 
2.39.5