summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-11 12:37:38 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-11 12:37:38 +0000
commit4e3e263c1c3f37c3917640f987edb8794c392235 (patch)
tree31a22e4aa955e7406c81f7b07a32cc301f8e757a
parent79954547dab0e2a87436fba02f95ee0dbcf7a1d9 (diff)
downloadzabbix-4e3e263c1c3f37c3917640f987edb8794c392235.tar.gz
zabbix-4e3e263c1c3f37c3917640f987edb8794c392235.tar.xz
zabbix-4e3e263c1c3f37c3917640f987edb8794c392235.zip
- [DEV-137] Misc bugs and improvements
[Now proxy configuration default update interval 1h] git-svn-id: svn://svn.zabbix.com/trunk@5893 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--misc/conf/zabbix_proxy.conf4
-rw-r--r--src/zabbix_proxy/proxy.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/conf/zabbix_proxy.conf b/misc/conf/zabbix_proxy.conf
index 420a2cf1..ac23ce68 100644
--- a/misc/conf/zabbix_proxy.conf
+++ b/misc/conf/zabbix_proxy.conf
@@ -66,9 +66,9 @@ Hostname=proxy
# How often ZABBIX will perform sync configuration data
# (in seconds)
-# Default value is 86400 seconds (24h)
+# Default value is 3600 seconds (1h)
# This parameter must be between 1 and 604800 (1 week)
-#ConfigFrequency=86400
+#ConfigFrequency=3600
# How often ZABBIX will perform housekeeping procedure
# (in hours)
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c
index da4587b7..7d86280a 100644
--- a/src/zabbix_proxy/proxy.c
+++ b/src/zabbix_proxy/proxy.c
@@ -129,7 +129,7 @@ int CONFIG_PROXY_OFFLINE_BUFFER = 1; /* 720h */
int CONFIG_HEARTBEAT_FREQUENCY = 60;
-int CONFIG_PROXYCONFIG_FREQUENCY = 3600*24;
+int CONFIG_PROXYCONFIG_FREQUENCY = 3600; /* 1h */
int CONFIG_DATASENDER_FREQUENCY = 1;