diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-14 16:21:12 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-14 16:21:12 +0000 |
| commit | 5e009a0ed6643f9af6016a4231fbcf5586def53b (patch) | |
| tree | fda4ca178d73e1b67362589c658c276c72b9b777 /src | |
| parent | 0cb3cf25a2356ebd6520c3948dc56164bd7cbe27 (diff) | |
| download | zabbix-5e009a0ed6643f9af6016a4231fbcf5586def53b.tar.gz zabbix-5e009a0ed6643f9af6016a4231fbcf5586def53b.tar.xz zabbix-5e009a0ed6643f9af6016a4231fbcf5586def53b.zip | |
- [DEV-110] Heartbeat
git-svn-id: svn://svn.zabbix.com/trunk@5493 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_proxy/heart/heart.c | 5 | ||||
| -rw-r--r-- | src/zabbix_server/trapper/trapper.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c index e7bc690a..091dd431 100644 --- a/src/zabbix_proxy/heart/heart.c +++ b/src/zabbix_proxy/heart/heart.c @@ -44,7 +44,6 @@ static void send_heartbeat() { zbx_sock_t sock; struct zbx_json j; - int res; zabbix_log(LOG_LEVEL_DEBUG, "In process_configuration_sync()"); @@ -55,7 +54,7 @@ static void send_heartbeat() if (FAIL == connect_to_server(&sock, CONFIG_HEARTBEAT_FREQUENCY)) /* alarm */ return; - if (FAIL == (res = put_data_to_server(&sock, &j))) + if (FAIL == put_data_to_server(&sock, &j)) zabbix_log(LOG_LEVEL_WARNING, "Heartbeat message sendig failed"); disconnect_server(&sock); @@ -81,7 +80,7 @@ void main_heart_loop() struct sigaction phan; int start, sleeptime; - zabbix_log(LOG_LEVEL_WARNING, "In main_heart_loop()"); + zabbix_log(LOG_LEVEL_DEBUG, "In main_heart_loop()"); phan.sa_handler = child_signal_handler; sigemptyset(&phan.sa_mask); diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 9d2c5d6f..309da7e6 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -490,6 +490,11 @@ static int process_proxy_heartbeat(zbx_sock_t *sock, struct zbx_json_parse *jp) update_proxy_lastaccess(proxy_hostid); + if (send_result(sock, SUCCEED, NULL) != SUCCEED) { + zabbix_log( LOG_LEVEL_WARNING, "Error sending result back"); + zabbix_syslog("Trapper: error sending result back"); + } + return SUCCEED; } |