From 55cf0435b172ecd6dbcd76c09c1222e6cb2b4594 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 3 Feb 2009 07:22:46 +0000 Subject: [PATCH] - updated Changed files: cacti-log-verbosity.patch -> 1.2 cacti-ss_disk-array-indices.patch -> 1.2 cacti-webroot.patch -> 1.2 --- cacti-log-verbosity.patch | 29 +++++++++-------------------- cacti-ss_disk-array-indices.patch | 16 +++++++--------- cacti-webroot.patch | 4 ++-- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/cacti-log-verbosity.patch b/cacti-log-verbosity.patch index 7baf9db..1037a54 100644 --- a/cacti-log-verbosity.patch +++ b/cacti-log-verbosity.patch @@ -1,24 +1,13 @@ --- cacti-0.8.7b/poller.php~ 2008-10-05 16:58:33.000000000 +0300 +++ cacti-0.8.7b/poller.php 2008-10-05 17:45:53.825952709 +0300 -@@ -312,7 +312,9 @@ - $num_polling_items, - $rrds_processed); +@@ -446,7 +446,8 @@ + $num_polling_items, + $rrds_processed); -- cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); -+ if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE) { -+ cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); -+ } +- cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); ++ if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE) ++ cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); - /* insert poller stats into the settings table */ - db_execute("replace into settings (name,value) values ('stats_poller','$cacti_stats')"); -@@ -352,7 +354,9 @@ - $num_polling_items, - $rrds_processed); - -- cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); -+ if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE) { -+ cacti_log("STATS: " . $cacti_stats ,true,"SYSTEM"); -+ } - - /* insert poller stats into the settings table */ - db_execute("replace into settings (name,value) values ('stats_poller','$cacti_stats')"); + /* insert poller stats into the settings table */ + db_execute("REPLACE INTO settings (name,value) VALUES ('stats_poller','$cacti_stats')"); + diff --git a/cacti-ss_disk-array-indices.patch b/cacti-ss_disk-array-indices.patch index d7d5f80..17484c2 100644 --- a/cacti-ss_disk-array-indices.patch +++ b/cacti-ss_disk-array-indices.patch @@ -1,17 +1,15 @@ --- ./scripts/ss_host_disk.php 2008-10-05 18:19:17.656634044 +0300 +++ ./scripts/ss_host_disk.php 2008-10-07 11:07:10.120905407 +0300 -@@ -65,7 +65,14 @@ +@@ -69,7 +69,11 @@ $arg = $arg1; - $arr_index = ss_host_disk_reindex(cacti_snmp_walk($hostname, $snmp_community, $oids["index"], $snmp_version, $snmp_auth_username, $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol, $snmp_context, $snmp_port, $snmp_timeout, read_config_option("snmp_retries"), SNMP_POLLER)); -+ if (empty($arr_index)) { + $arr_index = ss_host_disk_reindex(cacti_snmp_walk($hostname, $snmp_community, $oids["index"], $snmp_version, $snmp_auth_username, $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol, $snmp_context, $snmp_port, $snmp_timeout, $ping_retries, $max_oids, SNMP_POLLER)); ++ if (empty($arr_index)) + return; -+ } - $arr = ss_host_disk_reindex(cacti_snmp_walk($hostname, $snmp_community, $oids[$arg], $snmp_version, $snmp_auth_username, $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol, $snmp_context, $snmp_port, $snmp_timeout, read_config_option("snmp_retries"), SNMP_POLLER)); -+ if (empty($arr)) { -+ // we likely already got error already earlier, like "Timeout: No Response from localhost:161" -+ return; -+ } + $arr = ss_host_disk_reindex(cacti_snmp_walk($hostname, $snmp_community, $oids[$arg], $snmp_version, $snmp_auth_username, $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol, $snmp_context, $snmp_port, $snmp_timeout, $ping_retries, $max_oids, SNMP_POLLER)); ++ if (empty($arr)) ++ return; // we likely already got error already earlier, like "Timeout: No Response from localhost:161" for ($i=0;($i