diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-02-17 21:05:05 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-02-17 21:05:05 +0000 |
| commit | cdc279ffd0bc6428c338009856acc2374299db6c (patch) | |
| tree | f64fa872b6371e1edb3f6ffff50e32adc498657c | |
| parent | 926315e15e79fc31881f9726bc0f052eaa327afa (diff) | |
| download | zabbix-cdc279ffd0bc6428c338009856acc2374299db6c.tar.gz zabbix-cdc279ffd0bc6428c338009856acc2374299db6c.tar.xz zabbix-cdc279ffd0bc6428c338009856acc2374299db6c.zip | |
- fix for startup of housekeeping process (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1665 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 14 |
2 files changed, 9 insertions, 6 deletions
@@ -1,5 +1,6 @@ Changes for 1.1alpha6: + - fix for startup of housekeeping process (Alexei) - fix of agent crash on 64 bit platforms in CKSUM() (Alexei) - added frontends/php/overview.php (Alexei) - removed link to unexistant trends.php (Alexei) diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 25ac5c1e..8379dbcd 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -120,7 +120,7 @@ void uninit(void) { if(pids != NULL) { - for(i=0;i<CONFIG_SUCKERD_FORKS-1;i++) + for(i=0;i<CONFIG_SUCKERD_FORKS+CONFIG_TRAPPERD_FORKS-1;i++) { if(kill(pids[i],SIGTERM) !=0 ) { @@ -1254,7 +1254,11 @@ pid_t child_trapper_make(int i,int listenfd, int addrlen) if((pid = fork()) >0) { - return (pid); + return (pid); + } + else + { +// sucker_num=i; } /* never returns */ @@ -1331,7 +1335,7 @@ int main(int argc, char **argv) return 0; #endif DBclose(); - pids=calloc(CONFIG_SUCKERD_FORKS-1,sizeof(pid_t)); + pids=calloc(CONFIG_SUCKERD_FORKS+CONFIG_TRAPPERD_FORKS-1,sizeof(pid_t)); #ifdef ZABBIX_THREADS my_init(); @@ -1372,8 +1376,6 @@ int main(int argc, char **argv) listenfd = tcp_listen(host,CONFIG_LISTEN_PORT,&addrlen); - pids = calloc(CONFIG_TRAPPERD_FORKS, sizeof(pid_t)); - for(i = CONFIG_SUCKERD_FORKS; i< CONFIG_SUCKERD_FORKS+CONFIG_TRAPPERD_FORKS; i++) { pids[i] = child_trapper_make(i, listenfd, addrlen); @@ -1386,7 +1388,7 @@ int main(int argc, char **argv) else if(sucker_num == 1) { /* Second instance of zabbix_suckerd sends alerts to users */ - zabbix_log( LOG_LEVEL_WARNING, " #server %d started [Alerter]",sucker_num); + zabbix_log( LOG_LEVEL_WARNING, "server #%d started [Alerter]",sucker_num); main_alerter_loop(); } else if(sucker_num == 2) |