Skip to content

Commit e04f0f0

Browse files
committed
Fixing Issue #115
Some field where not corrected following the version change
1 parent b500771 commit e04f0f0

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ that.
157157

158158
--- develop ---
159159

160+
* issue#115: Some field where not corrected following the version change
161+
160162
* issue#116: Background process fail to operate syslog_coming table; syslog_process.php fail if current workdir is not CACTI_TOP
161163

162164
--- 2.7 ---

functions.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function syslog_remove_items($table, $uniqueID) {
247247
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
248248
(logtime, priority_id, facility_id, program_id, host_id, message)
249249
SELECT logtime, priority_id, facility_id, program_id, host_id, message
250-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
250+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
251251
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
252252
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
253253
ON sf.facility_id = si.facility_id
@@ -290,7 +290,7 @@ function syslog_remove_items($table, $uniqueID) {
290290
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
291291
(logtime, priority_id, facility_id, program_id, host_id, message)
292292
SELECT logtime, priority_id, facility_id, program_id, host_id, message
293-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
293+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
294294
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
295295
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
296296
ON sf.facility_id = si.facility_id
@@ -333,7 +333,7 @@ function syslog_remove_items($table, $uniqueID) {
333333
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
334334
(logtime, priority_id, facility_id, program_id, host_id, message)
335335
SELECT logtime, priority_id, facility_id, program_id, host_id, message
336-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
336+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
337337
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
338338
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
339339
ON sf.facility_id = si.facility_id
@@ -372,7 +372,7 @@ function syslog_remove_items($table, $uniqueID) {
372372
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
373373
(logtime, priority_id, facility_id, program_id, host_id, message)
374374
SELECT logtime, priority_id, facility_id, program_id, host_id, message
375-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
375+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
376376
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
377377
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
378378
ON sf.facility_id = si.facility_id
@@ -411,7 +411,7 @@ function syslog_remove_items($table, $uniqueID) {
411411
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
412412
(logtime, priority_id, facility_id, program_id, host_id, message)
413413
SELECT logtime, priority_id, facility_id, program_id, host_id, message
414-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
414+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
415415
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
416416
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
417417
ON sf.facility_id = si.facility_id
@@ -450,7 +450,7 @@ function syslog_remove_items($table, $uniqueID) {
450450
$sql1 = 'INSERT INTO `' . $syslogdb_default . '`.`syslog_removed`
451451
(logtime, priority_id, facility_id, program_id, host_id, message)
452452
SELECT logtime, priority_id, facility_id, program_id, host_id, message
453-
FROM (SELECT si.date, si.time, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
453+
FROM (SELECT si.logtime, si.priority_id, si.facility_id, spg.program_id, sh.host_id, si.message
454454
FROM `' . $syslogdb_default . '`.`syslog_incoming` AS si
455455
INNER JOIN `' . $syslogdb_default . '`.`syslog_facilities` AS sf
456456
ON sf.facility_id = si.facility_id

0 commit comments

Comments
 (0)