summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-05 16:42:58 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-05 16:42:58 +0000
commit0b765af5821ca1cf11057e2057ce466fbcfed5f2 (patch)
tree8f5075970e4e3184bdfa6f20e8b534d623b1e92b
parente44191a6fe4a5a879b8c5badb6fda8d78853bec1 (diff)
downloadzabbix-0b765af5821ca1cf11057e2057ce466fbcfed5f2.tar.gz
zabbix-0b765af5821ca1cf11057e2057ce466fbcfed5f2.tar.xz
zabbix-0b765af5821ca1cf11057e2057ce466fbcfed5f2.zip
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2605 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rwxr-xr-xgo4
-rw-r--r--src/zabbix_server/poller/poller.c9
2 files changed, 4 insertions, 9 deletions
diff --git a/go b/go
index 0eb157c7..93ae29fa 100755
--- a/go
+++ b/go
@@ -28,8 +28,8 @@ cp /usr/share/automake-1.9/missing missing
echo Configuring...
export CFLAGS="-Wall"
#export CFLAGS="-Wall -pedantic"
-#./configure --with-ldap --enable-agent --enable-server --with-mysql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null
-./configure --enable-agent --enable-server --with-mysql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null
+./configure --with-ldap --enable-agent --enable-server --with-mysql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null
+#./configure --enable-agent --enable-server --with-mysql --with-net-snmp --prefix=`pwd` 2>>WARNINGS >/dev/null
echo Cleaning...
make clean 2>>WARNINGS >/dev/null
echo Making...
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index dd9cfed8..cfdd35c2 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -237,11 +237,6 @@ int get_values(void)
{
process_new_value(&item,&agent);
- if(item.host_errors_from!=0)
- {
- zabbix_log( LOG_LEVEL_WARNING, "No network errors for [%s]", item.host);
- }
-
/* if(HOST_STATUS_UNREACHABLE == item.host_status)*/
if(HOST_AVAILABLE_TRUE != item.host_available)
{
@@ -291,7 +286,7 @@ int get_values(void)
DBexecute(sql);
}
- zabbix_log( LOG_LEVEL_WARNING, "errors_from [%d]+[%d]<[%d]", item.host_errors_from,CONFIG_UNAVAILABLE_PERIOD,now);
+/* zabbix_log( LOG_LEVEL_WARNING, "errors_from [%d]+[%d]<[%d]", item.host_errors_from,CONFIG_UNAVAILABLE_PERIOD,now);*/
if(item.host_errors_from+CONFIG_UNAVAILABLE_PERIOD<now)
{
zabbix_log( LOG_LEVEL_WARNING, "Host [%s] will be checked after [%d] seconds", item.host, 60);
@@ -303,7 +298,7 @@ int get_values(void)
/* Still unavailable, but won't change status to UNAVAILABLE yet */
else
{
- zabbix_log( LOG_LEVEL_WARNING, "Host [%s]: another network error, Wait for %d seconds", item.host, (int)(CONFIG_UNAVAILABLE_PERIOD/CHECKS_PER_UNAVAILABLE_PERIOD));
+ zabbix_log( LOG_LEVEL_WARNING, "Host [%s]: another network error, wait for %d seconds", item.host, (int)(CONFIG_UNAVAILABLE_PERIOD/CHECKS_PER_UNAVAILABLE_PERIOD));
snprintf(sql,sizeof(sql)-1,"update hosts set disable_until=%d where hostid=%d", now+(int)(CONFIG_UNAVAILABLE_PERIOD/CHECKS_PER_UNAVAILABLE_PERIOD), item.hostid);
zabbix_log( LOG_LEVEL_DEBUG, "SQL [%s]", sql);
DBexecute(sql);