Author: arekm Date: Tue Feb 3 07:22:51 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
cacti-log-verbosity.patch (1.1 -> 1.2) , cacti-ss_disk-array-indices.patch
(1.1 -> 1.2) , cacti-webroot.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/cacti-log-verbosity.patch
diff -u SOURCES/cacti-log-verbosity.patch:1.1
SOURCES/cacti-log-verbosity.patch:1.2
--- SOURCES/cacti-log-verbosity.patch:1.1 Sun Oct 5 16:46:41 2008
+++ SOURCES/cacti-log-verbosity.patch Tue Feb 3 08:22:44 2009
@@ -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')");
+
================================================================
Index: SOURCES/cacti-ss_disk-array-indices.patch
diff -u SOURCES/cacti-ss_disk-array-indices.patch:1.1
SOURCES/cacti-ss_disk-array-indices.patch:1.2
--- SOURCES/cacti-ss_disk-array-indices.patch:1.1 Tue Oct 7 18:29:15 2008
+++ SOURCES/cacti-ss_disk-array-indices.patch Tue Feb 3 08:22:45 2009
@@ -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<sizeof($arr_index));$i++) {
print $arr_index[$i] . "!" . $arr[$i] . "\n";
+
================================================================
Index: SOURCES/cacti-webroot.patch
diff -u SOURCES/cacti-webroot.patch:1.1 SOURCES/cacti-webroot.patch:1.2
--- SOURCES/cacti-webroot.patch:1.1 Sun Oct 5 16:03:46 2008
+++ SOURCES/cacti-webroot.patch Tue Feb 3 08:22:46 2009
@@ -4,10 +4,10 @@
$last_host = 0;
/* update web paths for the poller */
-- db_execute("replace into settings (name,value) values
('path_webroot','" . addslashes(($config["cacti_server_os"] == "win32") ?
strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__),
1),"\\", "/") : dirname(__FILE__)) . "')");
+- db_execute("REPLACE INTO settings (name,value) VALUES
('path_webroot','" . addslashes(($config["cacti_server_os"] == "win32") ?
strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__),
1),"\\", "/") : dirname(__FILE__)) . "')");
+// $path_webroot = ($config["cacti_server_os"] == "win32") ?
strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__),
1),"\\", "/") : dirname(__FILE__);
+ $path_webroot = $config['base_path'];
-+ db_execute("replace into settings (name,value) values
('path_webroot','" . addslashes($path_webroot) . "')");
++ db_execute("REPLACE INTO settings (name,value) VALUES
('path_webroot','" . addslashes($path_webroot) . "')");
/* obtain some defaults from the database */
$poller = read_config_option("poller_type");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cacti-log-verbosity.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cacti-ss_disk-array-indices.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cacti-webroot.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
