From b5fb0670a9b9816765320514bfe2139dbfe079b5 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 28 Nov 2006 10:34:58 +0000 Subject: Better shutdown. git-svn-id: svn://svn.zabbix.com/trunk@3535 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- src/libs/zbxnix/daemon.c | 2 +- src/libs/zbxnix/pid.c | 2 +- src/zabbix_server/server.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c index 7290be20..74b80030 100755 --- a/src/libs/zbxnix/daemon.c +++ b/src/libs/zbxnix/daemon.c @@ -40,7 +40,7 @@ void child_signal_handler(int sig) case SIGQUIT: case SIGINT: case SIGTERM: - zabbix_log( LOG_LEVEL_WARNING, "Got signal. Exiting ..."); + zabbix_log( LOG_LEVEL_DEBUG, "Got signal. Exiting ..."); uninit(); exit( FAIL ); break; diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c index fdf6b32e..ad4fa8f1 100755 --- a/src/libs/zbxnix/pid.c +++ b/src/libs/zbxnix/pid.c @@ -60,6 +60,6 @@ void drop_pid_file(const char *pidfile) { if(-1 == unlink(pidfile)) { - zabbix_log( LOG_LEVEL_WARNING, "Cannot remove PID file [%s] [%s]", pidfile, strerror(errno)); + zabbix_log( LOG_LEVEL_DEBUG, "Cannot remove PID file [%s] [%s]", pidfile, strerror(errno)); } } diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index ac9ae6d9..c43a4890 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -715,7 +715,7 @@ int MAIN_ZABBIX_ENTRY(void) void zbx_on_exit() { - zabbix_log(LOG_LEVEL_WARNING, "zbx_on_exit() called."); + zabbix_log(LOG_LEVEL_DEBUG, "zbx_on_exit() called."); #if !defined(_WINDOWS) @@ -723,7 +723,7 @@ void zbx_on_exit() if(threads != NULL) { - for(i = 0; i < CONFIG_POLLER_FORKS + CONFIG_TRAPPERD_FORKS; i++) + for(i = 1; i <= CONFIG_POLLER_FORKS+CONFIG_TRAPPERD_FORKS+CONFIG_PINGER_FORKS+CONFIG_ALERTER_FORKS+CONFIG_HOUSEKEEPER_FORKS+CONFIG_TIMER_FORKS+CONFIG_UNREACHABLE_POLLER_FORKS+CONFIG_NODEWATCHER_FORKS; i++) { if(threads[i]) { kill(threads[i],SIGTERM); -- cgit