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

all: add default log file if none are defined

Browse Source 
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
This commit is contained in:
Don Slice 2016-07-11 12:57:24 -07:00
parent 74fb6c66da
commit 2caa9b3957
10 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bgpd/bgp_main.c
View File

@ -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 ();

3
isisd/isis_main.c
View File

@ -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);

2
lib/log.h
View File

@ -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)"

2
ospf6d/ospf6_main.c
View File

@ -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);

3
ospfd/ospf_main.c
View File

@ -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 ();

5
pimd/pim_main.c
View File

@ -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);

3
ripd/rip_main.c
View File

@ -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);

3
ripngd/ripng_main.c
View File

@ -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);

2
watchquagga/watchquagga.c
View File

@ -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)
{

5
zebra/main.c
View File

@ -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);