2 files changed, 4 insertions, 9 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)))
 		{
diff --git a/src/zabbix_server/timer/timer.h b/src/zabbix_server/timer/timer.h
index bcd95c1d..469eb099 100644
--- a/src/zabbix_server/timer/timer.h
+++ b/src/zabbix_server/timer/timer.h
@@ -20,14 +20,8 @@
 #ifndef ZABBIX_TIMER_H
 #define ZABBIX_TIMER_H
 
-/*
-extern	void	signal_handler(int);
-extern  int     server_num;
+extern	int	CONFIG_NODEID;
 
-extern  int     CONFIG_TIMEOUT;
-extern  int     CONFIG_SUCKERD_FORKS;
-*/
-
-int main_timer_loop();
+void main_timer_loop();
 
 #endif