Skip to content

Commit d7f14d3

Browse files
committed
enable ispconfig logging in database.
1 parent b7c43a6 commit d7f14d3

File tree

6 files changed

+31
-14
lines changed

6 files changed

+31
-14
lines changed

interface/lib/classes/listform.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class listform {
3838
private $pagingValues;
3939
private $searchChanged = 0;
4040
private $module;
41-
private $dateformat = 'd.m.Y';
41+
private $dateformat = 'Y-m-d H:i';
4242
public $wordbook;
4343

4444
public function loadListDef($file, $module = '')

interface/web/admin/list/datalog.list.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
*****************************************************/
4646

4747
$liste["item"][] = array( 'field' => "tstamp",
48-
'datatype' => "VARCHAR",
49-
'formtype' => "DATE",
48+
'datatype' => "DATE",
49+
'formtype' => "TEXT",
5050
'op' => "like",
5151
'prefix' => "",
5252
'suffix' => "",

interface/web/admin/list/log.list.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
*****************************************************/
4646

4747
$liste["item"][] = array( 'field' => "tstamp",
48-
'datatype' => "VARCHAR",
49-
'formtype' => "DATE",
48+
'datatype' => "DATE",
49+
'formtype' => "TEXT",
5050
'op' => "like",
5151
'prefix' => "",
5252
'suffix' => "",

interface/web/admin/templates/datalog_list.htm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
2626
<tbody>
2727
<tmpl_loop name="records">
2828
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
29-
<td class="tbl_col_tstamp"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tstamp"}</a></td>
30-
<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>
31-
<td class="tbl_col_action"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
32-
<td class="tbl_col_dbtable"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="dbtable"}</a></td>
33-
<td class="tbl_col_status"><a href="#" onClick="loadContent('admin/datalog_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="status"}</a></td>
29+
<td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
30+
<td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
31+
<td class="tbl_col_action">{tmpl_var name="action"}</td>
32+
<td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
33+
<td class="tbl_col_status">{tmpl_var name="status"}</td>
3434
<td class="tbl_col_buttons">
3535
<div class="buttons icons16">
36-
<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>
36+
<!--<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> -->
3737
</div>
3838
</td>
3939
</tr>

server/cron_daily.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,18 @@
125125
}
126126
}
127127

128-
129-
130-
128+
#######################################################################################################
129+
// Cleanup logs in database
130+
#######################################################################################################
131+
//* Keep 7 days in sys_log
132+
$tstamp = time() - (60*60*24*7);
133+
$sql = "DELETE FROM sys_log WHERE tstamp < $tstamp";
134+
$app->db->query($sql);
135+
136+
//* Keep 7 days in sys_datalog
137+
$tstamp = time() - (60*60*24*7);
138+
$sql = "DELETE FROM sys_datalog WHERE tstamp < $tstamp";
139+
$app->db->query($sql);
131140

132141

133142
die("finished.\n");

server/lib/app.inc.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@ function log($msg, $priority = 0) {
125125
}
126126
echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\n";
127127
fclose($fp);
128+
129+
// Log to database
130+
$server_id = $conf['server_id'];
131+
$loglevel = $priority;
132+
$tstamp = time();
133+
$message = $app->db->quote($msg);
134+
$sql = "INSERT INTO sys_log (server_id,loglevel,tstamp,message) VALUES ('$server_id','$loglevel','$tstamp','$message')";
135+
$app->db->query($sql);
128136

129137
//} else {
130138
// die("Unable to write to logfile.");

0 commit comments

Comments
 (0)