proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 20:04:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for CM-12450 Ensure quagga logs at startup are sent to syslog (until log configuration is processed)

Browse Source 
Ticket: CM-12450
Reviewed By: CCR-5112
Testing Done: Manual
This commit is contained in:
Sid Khot 2016-08-17 19:36:54 -07:00
parent a94d98ae98
commit c05795b16b
10 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_main.c
View File

@ -419,7 +419,9 @@ main (int argc, char **argv)
zlog_default = openzlog (progname, ZLOG_BGP, 0, zlog_default = openzlog (progname, ZLOG_BGP, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&bgpd_privs); 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. */
bgp_master_init (); bgp_master_init ();

4
isisd/isis_main.c
View File

@ -245,7 +245,9 @@ main (int argc, char **argv, char **envp)
zlog_default = openzlog (progname, ZLOG_ISIS, 0, zlog_default = openzlog (progname, ZLOG_ISIS, 0,
LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON); LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
zprivs_init (&isisd_privs); 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 */ /* for reload */
_argc = argc; _argc = argc;

4
lib/command.c
View File

@ -3752,6 +3752,10 @@ set_log_file(struct vty *vty, const char *fname, int loglevel)
host.logfile = XSTRDUP (MTYPE_HOST, fname); 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; return CMD_SUCCESS;
} }

4
ospf6d/ospf6_main.c
View File

@ -321,7 +321,9 @@ main (int argc, char *argv[], char *envp[])
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_CONS|LOG_NDELAY|LOG_PID,
LOG_DAEMON); LOG_DAEMON);
zprivs_init (&ospf6d_privs); 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 */ /* initialize zebra libraries */
signal_init (master, array_size(ospf6_signals), ospf6_signals); signal_init (master, array_size(ospf6_signals), ospf6_signals);

4
ospfd/ospf_main.c
View File

@ -288,7 +288,9 @@ main (int argc, char **argv)
zlog_default = openzlog (progname, ZLOG_OSPF, instance, zlog_default = openzlog (progname, ZLOG_OSPF, instance,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&ospfd_privs); 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. */
ospf_master_init (); ospf_master_init ();

4
pimd/pim_main.c
View File

@ -138,7 +138,9 @@ int main(int argc, char** argv, char** envp) {
zlog_default = openzlog(progname, ZLOG_PIM, 0, zlog_default = openzlog(progname, ZLOG_PIM, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&pimd_privs); 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 */ /* this while just reads the options */
while (1) { while (1) {

4
ripd/rip_main.c
View File

@ -205,7 +205,9 @@ main (int argc, char **argv)
zlog_default = openzlog (progname, ZLOG_RIP, 0, zlog_default = openzlog (progname, ZLOG_RIP, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&ripd_privs); 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. */ /* Command line option parse. */
while (1) while (1)

4
ripngd/ripng_main.c
View File

@ -204,7 +204,9 @@ main (int argc, char **argv)
zlog_default = openzlog(progname, ZLOG_RIPNG, 0, zlog_default = openzlog(progname, ZLOG_RIPNG, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&ripngd_privs); 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) while (1)
{ {

2
watchquagga/watchquagga.c
View File

@ -1337,8 +1337,6 @@ main(int argc, char **argv)
zlog_default = openzlog(progname, ZLOG_NONE, 0, zlog_default = openzlog(progname, ZLOG_NONE, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); 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); zlog_set_level(NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
if (daemon_mode) if (daemon_mode)
{ {

4
zebra/main.c
View File

@ -245,7 +245,9 @@ main (int argc, char **argv)
zlog_default = openzlog (progname, ZLOG_ZEBRA, 0, zlog_default = openzlog (progname, ZLOG_ZEBRA, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&zserv_privs); 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) while (1)
{ {