From 887c44a4f3d8219dc5b1c52b5dcde1f31d52b73d Mon Sep 17 00:00:00 2001 From: ajs Date: Fri, 3 Dec 2004 16:36:46 +0000 Subject: 2004-12-03 Andrew J. Schorr * 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. --- ospfd/ospf_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ospfd/ospf_main.c') diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 09ff197a..d155c980 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -141,7 +141,7 @@ sighup (void) void sigint (void) { - zlog (NULL, LOG_INFO, "Terminating on signal"); + zlog_notice ("Terminating on signal"); ospf_terminate (); @@ -317,10 +317,8 @@ main (int argc, char **argv) /* Create VTY socket */ vty_serv_sock (vty_addr, vty_port, OSPF_VTYSH_PATH); -#ifdef DEBUG /* Print banner. */ - zlog (NULL, LOG_INFO, "OSPFd (%s) starts", QUAGGA_VERSION); -#endif + zlog_notice ("OSPFd %s starting: vty@%d", QUAGGA_VERSION, vty_port); /* Fetch next active thread. */ while (thread_fetch (master, &thread)) -- cgit v1.2.1