diff options
| author | ajs <ajs> | 2004-12-03 16:36:46 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2004-12-03 16:36:46 +0000 |
| commit | 887c44a4f3d8219dc5b1c52b5dcde1f31d52b73d (patch) | |
| tree | 5c0ef5fe1d3948c56e6abf2ffd3c9811e92f0f2e /isisd | |
| parent | bec595ada58ebfa98ad49220f29ab28b58549094 (diff) | |
2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* bgp_main.c: (sigint) Use zlog_notice for termination message.
(main) Use zlog_notice for startup announcement.
* isis_main.c: (sigint,sigterm) Use zlog_notice for termination message.
(terminate) This function should be static, not global.
(main) Use zlog_notice for startup announcement, and remove
ifdef ZEBRA_VERSION.
* version.h.in: Remove declaration for pid_output_lock, this function
is now static, not global.
* pid_output.c: (pid_output_lock) This function should be static, not
global. And remove "old umask" error message, since it was really
an unimportant debug message, not an error.
(pid_output) Need to declare static function pid_output_lock.
* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
message.
(main) Remove commented-out call to pid_output_lock (which should
never be called other than from inside pid_output). And use
zlog_notice to print the startup message, which now includes
the vty port.
* ospf_main.c: (sigint) Use zlog_notice for termination message.
(main) Issue a startup announcement using zlog_notice.
* rip_main.c: (sigint) Use zlog_notice for termination message.
(main) Add a startup announcement using zlog_notice.
* ripng_main.c: (sighup) Remove spurious terminating message.
(sigint) Use zlog_notice for termination message.
(main) Issue a startup announcement using zlog_notice.
* main.c: (sigint) Use zlog_notice for termination message.
(main) Add a startup announcement using zlog_notice.
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/ChangeLog | 7 | ||||
| -rw-r--r-- | isisd/isis_main.c | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog index 9ba86f17..e241d54d 100644 --- a/isisd/ChangeLog +++ b/isisd/ChangeLog @@ -1,3 +1,10 @@ +2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * isis_main.c: (sigint,sigterm) Use zlog_notice for termination message. + (terminate) This function should be static, not global. + (main) Use zlog_notice for startup announcement, and remove + ifdef ZEBRA_VERSION. + 2004-11-25 Hasso Tepper <hasso at quagga.net> * isis_main.c: Make group to run as configurable. diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 1bf93f21..9aa487a7 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -143,7 +143,7 @@ reload () execve (_progpath, _argv, _envp); } -void +static void terminate (int i) { exit (i); @@ -165,16 +165,14 @@ sighup (void) void sigint (void) { - zlog_info ("SIGINT received"); + zlog_notice ("Terminating on signal SIGINT"); terminate (0); - - return; } void sigterm (void) { - zlog_info ("SIGTERM received"); + zlog_notice ("Terminating on signal SIGTERM"); terminate (0); } @@ -326,11 +324,7 @@ main (int argc, char **argv, char **envp) vty_serv_sock (vty_addr, vty_port, ISIS_VTYSH_PATH); /* Print banner. */ -#if defined(ZEBRA_VERSION) - zlog_info ("ISISd %s starting: vty@%d", ZEBRA_VERSION, vty_port); -#elif defined(QUAGGA_VERSION) - zlog_info ("Quagga-ISISd %s starting: vty@%d", QUAGGA_VERSION, vty_port); -#endif + zlog_notice ("Quagga-ISISd %s starting: vty@%d", QUAGGA_VERSION, vty_port); #ifdef HAVE_IPV6 zlog_info ("IPv6 enabled"); #endif |