diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-01-24 20:49:34 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-01-24 20:49:34 +0000 |
| commit | d255e703145c33c17ef3cb50029b540b4d17fbf3 (patch) | |
| tree | 64691ee26894c80cac6b6dc26a49df27b57c69bf | |
| parent | baf2ac1227d0bdeeaf269ba02de4a78230ba84a6 (diff) | |
| download | zabbix-d255e703145c33c17ef3cb50029b540b4d17fbf3.tar.gz zabbix-d255e703145c33c17ef3cb50029b540b4d17fbf3.tar.xz zabbix-d255e703145c33c17ef3cb50029b540b4d17fbf3.zip | |
Small cleanup.
git-svn-id: svn://svn.zabbix.com/trunk@1629 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | include/functions.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/include/functions.c b/include/functions.c index 541eec5e..7233b880 100644 --- a/include/functions.c +++ b/include/functions.c @@ -1494,6 +1494,7 @@ void apply_actions(DB_TRIGGER *trigger,int trigger_value) int i,j; int now; + zabbix_set_log_level(LOG_LEVEL_DEBUG); zabbix_log( LOG_LEVEL_DEBUG, "In apply_actions(%d,%d)",trigger->triggerid, trigger_value); if(TRIGGER_VALUE_TRUE == trigger_value) @@ -1651,6 +1652,7 @@ void apply_actions(DB_TRIGGER *trigger,int trigger_value) } zabbix_log( LOG_LEVEL_DEBUG, "Actions applied for trigger %d %d", trigger->triggerid, trigger_value ); + zabbix_set_log_level(LOG_LEVEL_WARNING); DBfree_result(result); } diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 6abc1caa..25ac5c1e 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -646,8 +646,14 @@ int get_values(void) update_key_status(item.hostid,HOST_STATUS_MONITORED); #endif - break; +/* Why this break??? Trigger needs to be updated anyway! + break;*/ } +#ifdef ZABBIX_THREADS + update_triggers_thread(database, item.itemid); +#else + update_triggers(item.itemid); +#endif } else if(res == NOTSUPPORTED) { @@ -724,16 +730,6 @@ int get_values(void) zabbix_syslog("Getting value of [%s] from host [%s] failed", item.key, item.host ); zabbix_log( LOG_LEVEL_WARNING, "The value is not stored in database."); } - - if(res == SUCCEED) - { -#ifdef ZABBIX_THREADS - update_triggers_thread(database, item.itemid); -#else - update_triggers(item.itemid); -#endif - } - } DBfree_result(result); |