From d7f14d3fd1636399ab9254befc68826e5327a02b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 09 Dec 2008 16:18:34 -0500
Subject: [PATCH] enable ispconfig logging in database.
---
interface/web/admin/templates/datalog_list.htm | 12 ++++++------
interface/web/admin/list/datalog.list.php | 4 ++--
server/lib/app.inc.php | 8 ++++++++
interface/web/admin/list/log.list.php | 4 ++--
interface/lib/classes/listform.inc.php | 2 +-
server/cron_daily.php | 13 +++++++++++--
6 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 12d3e18..6ce5fee 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -38,7 +38,7 @@
private $pagingValues;
private $searchChanged = 0;
private $module;
- private $dateformat = 'd.m.Y';
+ private $dateformat = 'Y-m-d H:i';
public $wordbook;
public function loadListDef($file, $module = '')
diff --git a/interface/web/admin/list/datalog.list.php b/interface/web/admin/list/datalog.list.php
index a879737..a7a3030 100644
--- a/interface/web/admin/list/datalog.list.php
+++ b/interface/web/admin/list/datalog.list.php
@@ -45,8 +45,8 @@
*****************************************************/
$liste["item"][] = array( 'field' => "tstamp",
- 'datatype' => "VARCHAR",
- 'formtype' => "DATE",
+ 'datatype' => "DATE",
+ 'formtype' => "TEXT",
'op' => "like",
'prefix' => "",
'suffix' => "",
diff --git a/interface/web/admin/list/log.list.php b/interface/web/admin/list/log.list.php
index 56a9167..2093f9d 100644
--- a/interface/web/admin/list/log.list.php
+++ b/interface/web/admin/list/log.list.php
@@ -45,8 +45,8 @@
*****************************************************/
$liste["item"][] = array( 'field' => "tstamp",
- 'datatype' => "VARCHAR",
- 'formtype' => "DATE",
+ 'datatype' => "DATE",
+ 'formtype' => "TEXT",
'op' => "like",
'prefix' => "",
'suffix' => "",
diff --git a/interface/web/admin/templates/datalog_list.htm b/interface/web/admin/templates/datalog_list.htm
index d6edd09..34e6a33 100644
--- a/interface/web/admin/templates/datalog_list.htm
+++ b/interface/web/admin/templates/datalog_list.htm
@@ -26,14 +26,14 @@
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_tstamp"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tstamp"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_action"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
- <td class="tbl_col_dbtable"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="dbtable"}</a></td>
- <td class="tbl_col_status"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="status"}</a></td>
+ <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
+ <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
+ <td class="tbl_col_action">{tmpl_var name="action"}</td>
+ <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
+ <td class="tbl_col_status">{tmpl_var name="status"}</td>
<td class="tbl_col_buttons">
<div class="buttons icons16">
- <a class="icons16 icoDelete" href="javascript: del_record('admin/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <!--<a class="icons16 icoDelete" href="javascript: del_record('admin/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
</div>
</td>
</tr>
diff --git a/server/cron_daily.php b/server/cron_daily.php
index a54b07f..1dab45c 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -125,9 +125,18 @@
}
}
+#######################################################################################################
+// Cleanup logs in database
+#######################################################################################################
+//* Keep 7 days in sys_log
+$tstamp = time() - (60*60*24*7);
+$sql = "DELETE FROM sys_log WHERE tstamp < $tstamp";
+$app->db->query($sql);
-
-
+//* Keep 7 days in sys_datalog
+$tstamp = time() - (60*60*24*7);
+$sql = "DELETE FROM sys_datalog WHERE tstamp < $tstamp";
+$app->db->query($sql);
die("finished.\n");
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 7cf9a49..2e0189a 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -125,6 +125,14 @@
}
echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\n";
fclose($fp);
+
+ // Log to database
+ $server_id = $conf['server_id'];
+ $loglevel = $priority;
+ $tstamp = time();
+ $message = $app->db->quote($msg);
+ $sql = "INSERT INTO sys_log (server_id,loglevel,tstamp,message) VALUES ('$server_id','$loglevel','$tstamp','$message')";
+ $app->db->query($sql);
//} else {
// die("Unable to write to logfile.");
--
Gitblit v1.9.1