diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-09-06 19:09:52 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-09-06 19:09:52 +0000 |
| commit | 32aa4e7f66fdc3d7f4a9fec2e5efdc3cb7417bc1 (patch) | |
| tree | 7ca499cf3d8dad9cae3a7dcf84305f5b9363a577 /src | |
| parent | 61e6766bf1dd3a14331b5390001ad252ec933a7c (diff) | |
| download | zabbix-32aa4e7f66fdc3d7f4a9fec2e5efdc3cb7417bc1.tar.gz zabbix-32aa4e7f66fdc3d7f4a9fec2e5efdc3cb7417bc1.tar.xz zabbix-32aa4e7f66fdc3d7f4a9fec2e5efdc3cb7417bc1.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2046 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 8 | ||||
| -rw-r--r-- | src/zabbix_server/functions.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 2cd262f6..19c19c21 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -626,7 +626,7 @@ int DBupdate_trigger_value(int triggerid,int value,int clock) } */ -void update_triggers_status_to_unknown(int hostid,int clock) +void update_triggers_status_to_unknown(int hostid,int clock,char *reason) { int i; char sql[MAX_STRING_LEN]; @@ -645,7 +645,7 @@ void update_triggers_status_to_unknown(int hostid,int clock) { trigger.triggerid=atoi(DBget_field(result,i,0)); trigger.value=atoi(DBget_field(result,i,1)); - DBupdate_trigger_value(&trigger,TRIGGER_VALUE_UNKNOWN,clock); + DBupdate_trigger_value(&trigger,TRIGGER_VALUE_UNKNOWN,clock,reason); } DBfree_result(result); @@ -822,7 +822,7 @@ void DBupdate_triggers_status_after_restart(void) lastchange=atoi(DBget_field(result2,0,0)); DBfree_result(result2); - DBupdate_trigger_value(&trigger,TRIGGER_VALUE_UNKNOWN,lastchange); + DBupdate_trigger_value(&trigger,TRIGGER_VALUE_UNKNOWN,lastchange,"ZABBIX was down."); } DBfree_result(result); @@ -898,7 +898,7 @@ void DBupdate_host_availability(int hostid,int available,int clock, char *error) return; } - update_triggers_status_to_unknown(hostid,clock); + update_triggers_status_to_unknown(hostid,clock,"Host is unavailable."); zabbix_log(LOG_LEVEL_DEBUG,"End of update_host_availability()"); return; diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index da71a1d5..807d777a 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -363,13 +363,16 @@ void update_triggers(int itemid) { zabbix_log( LOG_LEVEL_WARNING, "Expression [%s] cannot be evaluated [%s]",trigger.expression, error); zabbix_syslog("Expression [%s] cannot be evaluated [%s]",trigger.expression, error); + + now = time(NULL); + DBupdate_trigger_value(&trigger, exp_value, now, error); continue; } zabbix_log( LOG_LEVEL_DEBUG, "exp_value trigger.value trigger.prevvalue [%d] [%d] [%d]", exp_value, trigger.value, trigger.prevvalue); now = time(NULL); - DBupdate_trigger_value(&trigger, exp_value, now); + DBupdate_trigger_value(&trigger, exp_value, now, NULL); } DBfree_result(result); } |