Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* issue#473: Syslog Status: choosing a card in Add card now appends it (Cacti's select2 dropdowns report changes through jQuery, which the card controller's native listener missed), and the Refresh interval is saved per user through a callback and refreshes the cards in place instead of reloading the page
* issue#473: Bound every log query at the current time so empty future partitions are always pruned, whatever the filter's own date range
* issue#473: The partition rebuild CLI now refuses to start while Syslog processing is enabled and holds a database lock that syslog_process.php also takes (on a connection of its own, so nested locks cannot release it); copies stored and removed messages without seq into a replacement whose AUTO_INCREMENT starts above the original high-water mark; verifies each 50,000-row batch by checksum and checkpoints it for resumable retries; widens the incoming queue in place to keep its sequence identities; and refuses legacy DATETIME history before changing anything
* issue: Load Cacti's lib/poller.php before the process-helper compatibility shims so a later include of it (for example during plugin upgrade checks) no longer fatals with "Cannot redeclare cacti_process_still_running()" on Cacti 1.2.32+
* issue: Tombstone the replaced cli/updatedb_convert_ms.php so upgrades remove it; it truncated the message tables and failed on legacy TO_DAYS partitioned tables. Use cli/upgrade_partitioning.php --convert-ms instead
* issue: Keep log column resizing within the results area on both log tabs, preserve message ellipsis, and use an accessible Font Awesome export button
* issue: Load grouped message details only on expansion, 50 at a time, preserving the displayed query's date range and filters instead of rendering every occurrence into hidden rows
Expand Down
12 changes: 12 additions & 0 deletions includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@
require_once $syslog_query_builder;
}

/*
* Load core's process helpers before the shims below. The function_exists()
* guards only defer to core when lib/poller.php is already loaded; otherwise
* a later include_once of lib/poller.php (e.g. from syslog_check_upgrade())
* fatals with "Cannot redeclare cacti_process_still_running()".
*/
global $config;

if (!function_exists('cacti_process_still_running') && isset($config['base_path']) && file_exists($config['base_path'] . '/lib/poller.php')) {
include_once($config['base_path'] . '/lib/poller.php');
}

/*
* Compatibility shims for Cacti process helpers.
*
Expand Down
Loading