diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-10 15:53:34 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-10 15:53:34 +0000 |
| commit | e14b3e34e93567f331b1669f79ba74c63be223d1 (patch) | |
| tree | 9fd7843664d3c1be12055b2bd192a7bd2a1775b7 /src/zabbix_sender | |
| parent | e486dc3d851b74b984c3433deaff836e69ea7507 (diff) | |
| download | zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.tar.gz zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.tar.xz zabbix-e14b3e34e93567f331b1669f79ba74c63be223d1.zip | |
- [ZBX-192] Data collection stopped after connexion loss
[svn merge -r5147:5153 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@5155 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_sender')
| -rw-r--r-- | src/zabbix_sender/zabbix_sender.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index c145ee9e..8e65928c 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -169,13 +169,9 @@ static ZBX_THREAD_ENTRY(send_value, args) signal( SIGTERM, send_signal_handler ); signal( SIGQUIT, send_signal_handler ); signal( SIGALRM, send_signal_handler ); - - alarm(SENDER_TIMEOUT); - #endif /* NOT _WINDOWS */ - - if( SUCCEED == (tcp_ret = zbx_tcp_connect(&sock, sentdval_args->server, sentdval_args->port)) ) - { + + if (SUCCEED == (tcp_ret = zbx_tcp_connect(&sock, sentdval_args->server, sentdval_args->port, SENDER_TIMEOUT))) { tosend = comms_create_request(sentdval_args->hostname, sentdval_args->key, sentdval_args->key_value, NULL, NULL, NULL, NULL); @@ -208,12 +204,6 @@ static ZBX_THREAD_ENTRY(send_value, args) zabbix_log(LOG_LEVEL_DEBUG, "Send value error: %s", zbx_tcp_strerror()); } -#if !defined(_WINDOWS) - - alarm(0); - -#endif /* NOT _WINDOWS */ - zbx_tread_exit(ret); } |