diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-09-14 11:06:27 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-09-14 11:06:27 +0000 |
| commit | 8755f9643aba3cffc5320321618fbe8e7b78b73b (patch) | |
| tree | 61f79790fee2222b1d3c5c3cd3faf09c9de8f168 /src/zabbix_server/timer/timer.c | |
| parent | 220a18752f8fefdd0af90ccd17cc045c2e6ae1a6 (diff) | |
Initial integration of distributed monitoring.
Changes 3196:HEAD of branches/distributed
git-svn-id: svn://svn.zabbix.com/trunk@3306 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/timer/timer.c')
| -rw-r--r-- | src/zabbix_server/timer/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 04c77d6c..72dfb8e4 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -42,6 +42,7 @@ #include "zlog.h" #include "common.h" +#include "timer.h" extern void update_triggers(int itemid); extern void update_functions(DB_ITEM *item); @@ -89,7 +90,7 @@ void main_timer_loop() #endif */ - result = DBselect("select distinct %s, functions f where h.hostid=i.hostid and h.status=%d and i.status=%d and f.function in ('nodata','date','dayofweek','time','now') and i.itemid=f.itemid", ZBX_SQL_ITEM_SELECT, HOST_STATUS_MONITORED, ITEM_STATUS_ACTIVE); + result = DBselect("select distinct %s, functions f where h.hostid=i.hostid and h.status=%d and i.status=%d and f.function in ('nodata','date','dayofweek','time','now') and i.itemid=f.itemid and" ZBX_COND_NODEID, ZBX_SQL_ITEM_SELECT, HOST_STATUS_MONITORED, ITEM_STATUS_ACTIVE, LOCAL_NODE("h.hostid")); while((row=DBfetch(result))) { |