rename syslog table to worklog

html/admin/logs/authlog.php

@@ -35,7 +35,7 @@ if (!empty($log_filter)) { $log_filter = $log_filter." and auth_id=".$auth_id; }
 if (!empty($fcustomer)) { $log_filter = $log_filter." and customer LIKE '%".$fcustomer."%'"; }
 if (!empty($fmessage)) { $log_filter = $log_filter." and message LIKE '%".$fmessage."%'"; }
 
-$countSQL="SELECT Count(*) FROM syslog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter";
+$countSQL="SELECT Count(*) FROM worklog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter";
 $res = mysqli_query($db_link, $countSQL);
 $count_records = mysqli_fetch_array($res);
 
@@ -55,7 +55,7 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 	</tr>
 <?php
 #speedup paging
-$sSQL = "SELECT timestamp,customer,message,level FROM syslog as S JOIN (SELECT id FROM syslog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter ORDER BY id DESC LIMIT $start,$displayed) AS I ON S.id = I.id";
+$sSQL = "SELECT timestamp,customer,message,level FROM worklog as S JOIN (SELECT id FROM worklog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter ORDER BY id DESC LIMIT $start,$displayed) AS I ON S.id = I.id";
 $userlog = get_records_sql($db_link, $sSQL);
 foreach ($userlog as $row) {
     print "<tr align=center align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";

html/admin/logs/index.php

@@ -32,7 +32,7 @@ if ($display_log_level == L_DEBUG) { $log_filter = ""; }
 if (!empty($fcustomer)) { $log_filter = $log_filter." and customer LIKE '%".$fcustomer."%'"; }
 if (!empty($fmessage)) { $log_filter = $log_filter." and message LIKE '%".$fmessage."%'"; }
 
-$countSQL="SELECT Count(*) FROM syslog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter";
+$countSQL="SELECT Count(*) FROM worklog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter";
 $res = mysqli_query($db_link, $countSQL);
 $count_records = mysqli_fetch_array($res);
 
@@ -54,7 +54,7 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 
 <?php
 #speedup paging
-$sSQL = "SELECT `timestamp`,customer,message,level FROM syslog as S JOIN (SELECT id FROM syslog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter ORDER BY id DESC LIMIT $start,$displayed) AS I ON S.id = I.id";
+$sSQL = "SELECT `timestamp`,customer,message,level FROM worklog as S JOIN (SELECT id FROM worklog WHERE `timestamp`>='$date1' AND `timestamp`<'$date2' $log_filter ORDER BY id DESC LIMIT $start,$displayed) AS I ON S.id = I.id";
 
 $userlog = get_records_sql($db_link, $sSQL);
 foreach ($userlog as $row) {

scripts/eyelib/mysql.pm

@@ -228,7 +228,7 @@ if ($level eq $L_INFO and $log_level >= $L_INFO) { log_info($msg); $db_log = 1;
 if ($level eq $L_DEBUG and $log_level >= $L_DEBUG) { log_debug($msg); $db_log = 1; }
 
 if ($db_log) {
-    my $history_sql="INSERT INTO syslog(customer,message,level,auth_id) VALUES(".$db->quote($MY_NAME).",".$db->quote($msg).",$level,$auth_id)";
+    my $history_sql="INSERT INTO worklog(customer,message,level,auth_id) VALUES(".$db->quote($MY_NAME).",".$db->quote($msg).",$level,$auth_id)";
     my $history_rf=$db->prepare($history_sql) or die "Unable to prepare $history_sql:" . $db->errstr;
     $history_rf->execute() or die "Unable to execute $history_sql: " . $db->errstr;
     }

scripts/garbage.pl

@@ -32,7 +32,7 @@ my @db_tables =(
 'User_stats',
 'User_stats_full',
 'dhcp_log',
-'syslog',
+'worklog',
 'remote_syslog',
 'Traffic_detail',
 );
@@ -245,8 +245,8 @@ $day_dur = DateTime::Duration->new( days => $history_log_day );
 $clean_date = $now - $day_dur;
 $clean_str = $dbh->quote($clean_date->ymd("-")." 00:00:00");
 
-db_log_info($dbh,"Clean worklog older that ".$clean_str);
-do_sql($dbh,"DELETE FROM syslog WHERE `timestamp` < $clean_str" );
+db_log_info($dbh,"Clean VERBOSE worklog older that ".$clean_str);
+do_sql($dbh,"DELETE FROM worklog WHERE level>$L_INFO AND `timestamp` < $clean_str" );
 
 #clean debug logs older than 2 days
 $day_dur = DateTime::Duration->new( days => 2 );
@@ -254,7 +254,7 @@ $clean_date = $now - $day_dur;
 $clean_str = $dbh->quote($clean_date->ymd("-")." 00:00:00");
 
 db_log_info($dbh,"Clean debug worklog older that ".$clean_str);
-do_sql($dbh,"DELETE FROM syslog WHERE level>3 AND `timestamp` < $clean_str" );
+do_sql($dbh,"DELETE FROM worklog WHERE level>$L_DEBUG AND `timestamp` < $clean_str" );
 
 ##### remote syslog  ######
 

scripts/updates/2-5-3/mysql-acl.sql

@@ -8,3 +8,4 @@ UPDATE `Customers` set rights=1 WHERE rights=0;
 ALTER TABLE `acl`  ADD PRIMARY KEY (`id`);
 ALTER TABLE `acl`  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
 ALTER TABLE `Customers` ADD `comment` VARCHAR(100) NULL AFTER `Login`;
+RENAME TABLE `syslog` TO `worklog`;