diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-03 09:11:21 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-03 09:11:21 +0000 |
| commit | 66264a7a717f70e375b2bf8a6e2327fef278ff7f (patch) | |
| tree | 35b5fda634cf65266b4326986626488f08e0f578 /src | |
| parent | 4d694f89ae1ac1635ef782fd482398a1d06b5a5d (diff) | |
- [DEV-109] Server - Trapper
git-svn-id: svn://svn.zabbix.com/trunk@5430 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/discoverer/discoverer.c | 10 | ||||
| -rw-r--r-- | src/zabbix_server/trapper/trapper.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c index 5dcb0173..c17da1f8 100644 --- a/src/zabbix_server/discoverer/discoverer.c +++ b/src/zabbix_server/discoverer/discoverer.c @@ -361,7 +361,7 @@ static void proxy_resigter_dhistory(int now, zbx_uint64_t druleid, int type, con DBescape_string(value, value_esc, sizeof(value_esc)); DBexecute("insert into proxy_dhistory (clock,druleid,type,ip,port,key_,value,status)" - "values (%d," ZBX_FS_UI64 ",%d,'%s',%d,'%s','%s',%d)", + " values (%d," ZBX_FS_UI64 ",%d,'%s',%d,'%s','%s',%d)", now, druleid, type, @@ -462,18 +462,12 @@ static void update_service(DB_DRULE *rule, DB_DCHECK *check, char *ip, int port) update_dservice(&service); } } + add_service_event(&service); } else if (zbx_process == ZBX_PROCESS_PROXY) { proxy_resigter_dhistory(now, rule->druleid, check->type, ip, port, check->key_, check->value, check->status); } - else - { - zabbix_log(LOG_LEVEL_CRIT, "Invalid process type"); - exit(FAIL); - } - - add_service_event(&service); } /****************************************************************************** diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 48684eb3..58c7b90e 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -544,7 +544,7 @@ static int process_trap(zbx_sock_t *sock,char *s, int max_len) { send_proxyconfig(sock, &jp); } - else if (0 == strcmp(value, ZBX_PROTO_VALUE_SENDER_DATA)) + else if (0 == strcmp(value, ZBX_PROTO_VALUE_HISTORY_DATA)) { ret = process_new_values(sock, &jp); } |