Skip to content

Commit b500771

Browse files
ddb4githubJing Chen
andauthored
Fixed two issues: SQL Error: Unknown column 'logtime' in 'field list' and PHP Warning: include(./include/cli_check.php): failed to open stream: (#116)
* Fixed: SQL Error: Unknown column 'logtime' in 'field list' before access any web page after deploy v2.7 * Fixed#116: Update README.md * Fixed: Update INFO-->Compat because #116 removed include...lib/poller.php Co-authored-by: Jing Chen <three_chenjing@sohu.com>
1 parent 14e7ba5 commit b500771

4 files changed

Lines changed: 13 additions & 10 deletions

File tree

INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ longname = Syslog Monitoring
55
author = The Cacti Group
66
email =
77
homepage = http://www.cacti.net
8-
compat = 1.2.8
8+
compat = 1.2.10
99
capabilities = online_view:1, online_mgmt:1, offline_view:0, offline_mgmt:0, remote_collect:0

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ that.
155155

156156
## ChangeLog
157157

158+
--- develop ---
159+
160+
* issue#116: Background process fail to operate syslog_coming table; syslog_process.php fail if current workdir is not CACTI_TOP
161+
158162
--- 2.7 ---
159163

160164
* issue#110: Syslog Alerts cause DB errors
@@ -166,10 +170,10 @@ that.
166170
* issue#104: When filtering, syslog incorrectly thinks the Cacti hosts table
167171
does not exist
168172

169-
* issue#107: Removal rule not using correct DB when using $use_cacti_db = false;
170-
171-
* issue#109: Should merge CVE-2020-7106 solution to syslog plugin
172-
173+
* issue#107: Removal rule not using correct DB when using $use_cacti_db = false;
174+
175+
* issue#109: Should merge CVE-2020-7106 solution to syslog plugin
176+
173177
* issue: Massive performance improvement in statistics page rendering
174178

175179
--- 2.5 ---

setup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ function syslog_check_upgrade() {
212212

213213
// Let's only run this check if we are on a page that actually needs the data
214214
$files = array('plugins.php', 'syslog.php', 'syslog_removal.php', 'syslog_alerts.php', 'syslog_reports.php');
215-
if (!in_array(get_current_page(), $files)) {
215+
if (substr($_SERVER['SCRIPT_FILENAME'], -18) != 'syslog_process.php' && !in_array(get_current_page(), $files)) {
216216
return;
217217
}
218218

syslog_process.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
+-------------------------------------------------------------------------+
2323
*/
2424

25-
include('./include/cli_check.php');
26-
include_once('./lib/poller.php');
27-
include('./plugins/syslog/config.php');
28-
include_once('./plugins/syslog/functions.php');
25+
include(dirname(__FILE__) . '/../../include/cli_check.php');
26+
include(dirname(__FILE__) . '/config.php');
27+
include_once(dirname(__FILE__) . '/functions.php');
2928

3029
/* Let it run for an hour if it has to, to clear up any big
3130
* bursts of incoming syslog events

0 commit comments

Comments
 (0)