summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2001-07-03 06:07:26 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2001-07-03 06:07:26 +0000
commit2c88dcbac3de23650e7fccaa91f003e9ae54550d (patch)
tree60f3f30933c79818480ae06b58f0e9b02c2317f0 /src
parente8371e423287f73f1ad30bc35a25bce761a0d27b (diff)
downloadzabbix-2c88dcbac3de23650e7fccaa91f003e9ae54550d.tar.gz
zabbix-2c88dcbac3de23650e7fccaa91f003e9ae54550d.tar.xz
zabbix-2c88dcbac3de23650e7fccaa91f003e9ae54550d.zip
Patches for alpha6->alpha7. Fixed bug with lost status of trigger.
git-svn-id: svn://svn.zabbix.com/trunk@122 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_sucker/zabbix_sucker.c2
-rw-r--r--src/zabbix_trapper/zabbix_trapper.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c
index f415bc12..689d5f27 100644
--- a/src/zabbix_sucker/zabbix_sucker.c
+++ b/src/zabbix_sucker/zabbix_sucker.c
@@ -168,8 +168,6 @@ int get_value_SNMPv1(double *result,DB_ITEM *item)
}
else
{
-/* FAILURE: print what went wrong! */
-
if (status == STAT_SUCCESS)
{
syslog( LOG_WARNING, "Error in packet\nReason: %s\n",
diff --git a/src/zabbix_trapper/zabbix_trapper.c b/src/zabbix_trapper/zabbix_trapper.c
index a3e016aa..5b7b0b04 100644
--- a/src/zabbix_trapper/zabbix_trapper.c
+++ b/src/zabbix_trapper/zabbix_trapper.c
@@ -125,6 +125,11 @@ int process_data(char *server,char *key, double value)
DBexecute(sql);
+ if( update_functions( itemid ) == FAIL)
+ {
+ return FAIL;
+ }
+
update_triggers( itemid );
DBfree_result(result);