diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-10-08 09:03:42 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-10-08 09:03:42 +0000 |
| commit | 5a13725043563593b4ffd45c8e5ba105b4b02486 (patch) | |
| tree | 6b5d6da2ae635c37f6ea65cb2ce34b1dd318f67c /src | |
| parent | dbf027dc0402d94a0da31804edc561ef9dbdeee8 (diff) | |
- more changes in timeout handling (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@236 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 5 | ||||
| -rw-r--r-- | src/zabbix_sucker/zabbix_sucker.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 67b3159c..bc99dc61 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -136,12 +136,12 @@ void process_child(int sockfd) struct sigaction phan; - for(;;) +// for(;;) { phan.sa_handler = &signal_handler; /* set up sig handler using sigaction() */ sigemptyset(&phan.sa_mask); /* just block alarm signal */ phan.sa_flags = 0; -// phan.sa_flags = SA_RESTART; + phan.sa_flags = SA_RESTART; sigaction(SIGALRM, &phan, NULL); alarm(AGENT_TIMEOUT); // @@ -313,7 +313,6 @@ int main() init_security(); - syslog( LOG_WARNING, "zabbix_agentd started"); if(gethostname(host,127) != 0) diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c index 95705924..93515e72 100644 --- a/src/zabbix_sucker/zabbix_sucker.c +++ b/src/zabbix_sucker/zabbix_sucker.c @@ -220,7 +220,7 @@ int get_value_zabbix(double *result,DB_ITEM *item) phan.sa_handler = &signal_handler; /* set up sig handler using sigaction() */ sigemptyset(&phan.sa_mask); /* just block alarm signal */ phan.sa_flags = 0; -// phan.sa_flags = SA_RESTART; + phan.sa_flags = SA_RESTART; sigaction(SIGALRM, &phan, NULL); alarm(1); |