summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_main.c4
-rw-r--r--isisd/isis_main.c4
-rw-r--r--lib/command.c4
-rw-r--r--ospf6d/ospf6_main.c4
-rw-r--r--ospfd/ospf_main.c4
-rw-r--r--pimd/pim_main.c4
-rw-r--r--ripd/rip_main.c4
-rw-r--r--ripngd/ripng_main.c4
-rw-r--r--watchquagga/watchquagga.c2
-rw-r--r--zebra/main.c4
10 files changed, 28 insertions, 10 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index a5f066bff0..0d24c9c294 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -419,7 +419,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* BGP master init. */
bgp_master_init ();
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index f088bc1dec..234e516db5 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -245,7 +245,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* for reload */
_argc = argc;
diff --git a/lib/command.c b/lib/command.c
index 2e80eea9e3..10ab066bfb 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -3752,6 +3752,10 @@ set_log_file(struct vty *vty, const char *fname, int loglevel)
host.logfile = XSTRDUP (MTYPE_HOST, fname);
+#if defined(HAVE_CUMULUS)
+ if (zlog_default->maxlvl[ZLOG_DEST_SYSLOG] != ZLOG_DISABLED)
+ zlog_default->maxlvl[ZLOG_DEST_SYSLOG] = ZLOG_DISABLED;
+#endif
return CMD_SUCCESS;
}
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index c989a5a10a..a368b05304 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -321,7 +321,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* initialize zebra libraries */
signal_init (master, array_size(ospf6_signals), ospf6_signals);
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 495ee2fd02..48f39d0099 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -288,7 +288,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* OSPF master init. */
ospf_master_init ();
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index b28b3d6242..b65b925fad 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -138,7 +138,9 @@ int main(int argc, char** argv, char** envp) {
zlog_default = openzlog(progname, ZLOG_PIM, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&pimd_privs);
- zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* this while just reads the options */
while (1) {
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index f920e809e2..aa1c4ff4df 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -205,7 +205,9 @@ main (int argc, char **argv)
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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* Command line option parse. */
while (1)
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index a1c71c8562..f401a43156 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -204,7 +204,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
while (1)
{
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index 2a237efb6a..e882653e38 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1337,8 +1337,6 @@ 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 ab907f83e8..8a9857a04d 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -245,7 +245,9 @@ 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);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
while (1)
{