From 482f9753760b9e0e75540cb0627ce060ab79637a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 13 Dec 2010 09:51:27 +0000 Subject: [PATCH] - original patches came first, pa patch needs update Changed files: cacti.spec -> 1.132 html_output.patch -> 1.3 poller_interval.patch -> 1.3 --- cacti.spec | 4 +++- html_output.patch | 12 +++++------- poller_interval.patch | 27 +++++++++++---------------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/cacti.spec b/cacti.spec index 3399954..e99bb20 100644 --- a/cacti.spec +++ b/cacti.spec @@ -125,7 +125,7 @@ Dokumentacja do Cacti w formacie HTML. %prep %setup -q -%{?with_pa:%patch0 -p1} +# official patches %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -134,6 +134,8 @@ Dokumentacja do Cacti w formacie HTML. %patch15 -p1 %patch16 -p1 +%{?with_pa:%patch0 -p1} + %patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/html_output.patch b/html_output.patch index 2341142..22f0985 100644 --- a/html_output.patch +++ b/html_output.patch @@ -30,17 +30,16 @@ " . ((!empty($_GET["id"]) && (empty($data_template["id"]))) ? "New " : "") . " \n"; -@@ -1324,16 +1324,17 @@ +@@ -1310,16 +1310,17 @@ + $i = 0; if (sizeof($data_sources) > 0) { foreach ($data_sources as $data_source) { - $data_source = api_plugin_hook_function('data_sources_table', $data_source); - $data_template_name = ((empty($data_source["data_template_name"])) ? "None" : $data_source["data_template_name"]); - $data_input_name = ((empty($data_source["data_input_name"])) ? "External" : $data_source["data_input_name"]); -- $poller_interval = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0); + /* we're escaping strings here, so no need to escape them on form_selectable_cell */ -+ $data_template_name = ((empty($data_source["data_template_name"])) ? "None": htmlspecialchars($data_source["data_template_name"])); -+ $data_input_name = ((empty($data_source["data_input_name"])) ? "External": htmlspecialchars($data_source["data_input_name"])); -+ $poller_interval = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0); ++ $data_template_name = ((empty($data_source["data_template_name"])) ? "None" : htmlspecialchars($data_source["data_template_name"])); ++ $data_input_name = ((empty($data_source["data_input_name"])) ? "External" : htmlspecialchars($data_source["data_input_name"])); + $poller_interval = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0); form_alternate_row_color($colors["alternate"], $colors["light"], $i, 'line' . $data_source["local_data_id"]); $i++; form_selectable_cell("" . ((get_request_var_request("filter") != "") ? eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")", "\\1", title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) : title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) . "", $data_source["local_data_id"]); form_selectable_cell($data_source['local_data_id'], $data_source['local_data_id']); @@ -70,4 +69,3 @@ form_selectable_cell($graph["height"] . "x" . $graph["width"], $graph["local_graph_id"]); form_checkbox_cell($graph["title_cache"], $graph["local_graph_id"]); form_end_row(); - diff --git a/poller_interval.patch b/poller_interval.patch index 57e2c63..dac3956 100644 --- a/poller_interval.patch +++ b/poller_interval.patch @@ -117,8 +117,7 @@ diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php } } } - -@@ -430,29 +430,28 @@ +@@ -427,28 +426,27 @@ $poller_runs_completed++; /* record the start time for this loop */ @@ -133,34 +132,30 @@ diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php - $sleep_time = ($poller_interval - ($loop_end - $loop_start) - $overhead_time); - }else{ - $sleep_time = ($poller_interval - ($loop_end - $loop_start)); -- } -- -+ $sleep_time = $poller_interval - $loop_time - $overhead_time; -+ } else { -+ $sleep_time = $poller_interval - $loop_time; -+ } -+ ++ $sleep_time = $poller_interval - $loop_time - $overhead_time; ++ } else { ++ $sleep_time = $poller_interval - $loop_time; + } + /* log some nice debug information */ - if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG) { - echo "Loop Time is: " . ($loop_end - $loop_start) . "\n"; - echo "Sleep Time is: " . $sleep_time . "\n"; - echo "Total Time is: " . ($loop_end - $poller_start) . "\n"; -+ if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) { -+ echo "Loop Time is: " . round($loop_time, 2) . "\n"; -+ echo "Sleep Time is: " . round($sleep_time, 2) . "\n"; -+ echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n"; ++ if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) { ++ echo "Loop Time is: " . round($loop_time, 2) . "\n"; ++ echo "Sleep Time is: " . round($sleep_time, 2) . "\n"; ++ echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n"; } /* sleep the appripriate amount of time */ if ($poller_runs_completed < $poller_runs) { - api_plugin_hook('poller_bottom'); - db_close(); usleep($sleep_time * 1000000); - db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type, $database_port); - api_plugin_hook('poller_top'); } }else if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_MEDIUM || $debug) { - + cacti_log("WARNING: Cacti Polling Cycle Exceeded Poller Interval by " . $loop_end-$loop_start-$poller_interval . " seconds", TRUE, "POLLER"); @@ -459,7 +457,7 @@ $hosts_per_process, $num_polling_items, $rrds_processed) { -- 2.43.0