diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-14 14:57:48 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-14 14:57:48 +0000 |
| commit | cca424fd4aa35e99973ff865225ecf5aedf8bed4 (patch) | |
| tree | 66542897c17cbb32af96a83c85922ea1c88825a3 | |
| parent | a78f14be7228a3e1ac52b6d867baf16a49f41ba4 (diff) | |
| download | zabbix-cca424fd4aa35e99973ff865225ecf5aedf8bed4.tar.gz zabbix-cca424fd4aa35e99973ff865225ecf5aedf8bed4.tar.xz zabbix-cca424fd4aa35e99973ff865225ecf5aedf8bed4.zip | |
- [DEV-137] Misc bugs and improvements
git-svn-id: svn://svn.zabbix.com/trunk@5914 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | src/zabbix_server/trapper/trapper.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 182e01ea..b8d63790 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -256,6 +256,7 @@ static void process_mass_data(zbx_sock_t *sock, zbx_uint64_t proxy_hostid, AGENT { if (0 == CONFIG_DBSYNCER_FORKS) { + DBbegin(); switch (zbx_process) { case ZBX_PROCESS_SERVER: process_new_value(&item, &agent, values[i].clock); @@ -265,6 +266,7 @@ static void process_mass_data(zbx_sock_t *sock, zbx_uint64_t proxy_hostid, AGENT proxy_process_new_value(&item, &agent, values[i].clock); break; } + DBcommit(); } else { @@ -464,20 +466,15 @@ static int process_new_values(zbx_sock_t *sock, struct zbx_json_parse *jp, const value_num ++; if (value_num == VALUES_MAX) { - DBbegin(); process_mass_data(sock, proxy_hostid, values, value_num, &processed, proxy_timediff); - DBcommit(); clean_agent_values(values, value_num); value_num = 0; } } - if (value_num > 0) { - DBbegin(); + if (value_num > 0) process_mass_data(sock, proxy_hostid, values, value_num, &processed, proxy_timediff); - DBcommit(); - } clean_agent_values(values, value_num); @@ -741,9 +738,7 @@ static int process_trap(zbx_sock_t *sock, char *s, int max_len) av.source = source; av.severity = atoi(severity); - DBbegin(); process_mass_data(sock, 0, &av, 1, NULL, 0); - DBcommit(); if( zbx_tcp_send_raw(sock, SUCCEED == ret ? "OK" : "NOT OK") != SUCCEED) { |