- Patch #63881 by kbahey and jakeg: improved Drupal's logging functionality. Added support for external loggers, and included a small syslog module into core.
Dries Buytaert
parent
ded653fbbd
commit
07e6bdcdfe
includes
modules
profiles/default
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
Drupal 6.0, xxxx-xx-xx (development version)
|
||||
----------------------
|
||||
- New watchdog as a hook functionality.
|
||||
* New hook_watchdog that can be implemented by any module to route log messages to various destinations.
|
||||
* Expands the severity levels from 3 (Error, Warning, Notice) to the 8 levels defined in RFC 3164.
|
||||
* The watchdog module is now called dblog, and is optional, but enabled by default in the default install profile.
|
||||
* New optional syslog.module now in core.
|
||||
- Added theme registry: modules can directly provide .tpl.php files for their themes without having to create theme_ functions.
|
||||
- Added versioning support to node terms.
|
||||
- Made it easier to theme the forum overview page.
|
||||
|
|
|
|||
|
|
@ -35,22 +35,17 @@ define('CACHE_NORMAL', 1);
|
|||
define('CACHE_AGGRESSIVE', 2);
|
||||
|
||||
/**
|
||||
* Indicates a notice-level watchdog event; these are normally notifications
|
||||
* of normal system events that have occurred and can usually be safely ignored.
|
||||
*
|
||||
* Severity levels, as defined in RFC 3164 http://www.faqs.org/rfcs/rfc3164.html
|
||||
*/
|
||||
define('WATCHDOG_NOTICE', 0);
|
||||
|
||||
/**
|
||||
* Indicates a warning-level watchdog event; this can be triggered by an error
|
||||
* in a module that does not impact the overall functionality of the site.
|
||||
*/
|
||||
define('WATCHDOG_WARNING', 1);
|
||||
|
||||
/**
|
||||
* Indicates an error-level watchdog event; could be indicative of an attempt
|
||||
* to compromise the security of the site, or a serious system error.
|
||||
*/
|
||||
define('WATCHDOG_ERROR', 2);
|
||||
define('WATCHDOG_EMERG', 0); // Emergency: system is unusable
|
||||
define('WATCHDOG_ALERT', 1); // Alert: action must be taken immediately
|
||||
define('WATCHDOG_CRITICAL', 2); // Critical: critical conditions
|
||||
define('WATCHDOG_ERROR', 3); // Error: error conditions
|
||||
define('WATCHDOG_WARNING', 4); // Warning: warning conditions
|
||||
define('WATCHDOG_NOTICE', 5); // Notice: normal but significant condition
|
||||
define('WATCHDOG_INFO', 6); // Informational: informational messages
|
||||
define('WATCHDOG_DEBUG', 7); // Debug: debug-level messages
|
||||
|
||||
/**
|
||||
* First bootstrap phase: initialize configuration.
|
||||
|
|
@ -649,25 +644,29 @@ function request_uri() {
|
|||
* @param $message
|
||||
* The message to store in the log.
|
||||
* @param $severity
|
||||
* The severity of the message. One of the following values:
|
||||
* - WATCHDOG_NOTICE
|
||||
* - WATCHDOG_WARNING
|
||||
* - WATCHDOG_ERROR
|
||||
* The severity of the message, as per RFC 3164
|
||||
* @param $link
|
||||
* A link to associate with the message.
|
||||
*/
|
||||
function watchdog($type, $message, $severity = WATCHDOG_NOTICE, $link = NULL) {
|
||||
global $user, $base_root;
|
||||
|
||||
$current_db = db_set_active();
|
||||
// Prepare the fields to be logged
|
||||
$log_message = array(
|
||||
'type' => $type,
|
||||
'message' => $message,
|
||||
'severity' => $severity,
|
||||
'link' => $link,
|
||||
'user' => $user,
|
||||
'request_uri' => $base_root . request_uri(),
|
||||
'referer' => referer_uri(),
|
||||
'ip' => $_SERVER['REMOTE_ADDR'],
|
||||
'timestamp' => time(),
|
||||
);
|
||||
|
||||
// Note: log the exact, entire absolute URL.
|
||||
$request_uri = $base_root . request_uri();
|
||||
|
||||
db_query("INSERT INTO {watchdog} (uid, type, message, severity, link, location, referer, hostname, timestamp) VALUES (%d, '%s', '%s', %d, '%s', '%s', '%s', '%s', %d)", $user->uid, $type, $message, $severity, $link, $request_uri, referer_uri(), $_SERVER['REMOTE_ADDR'], time());
|
||||
|
||||
if ($current_db) {
|
||||
db_set_active($current_db);
|
||||
// Call the logging hooks to log/process the message
|
||||
foreach (module_implements('watchdog', TRUE) as $module) {
|
||||
module_invoke($module, 'watchdog', $log_message);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -423,5 +423,5 @@ function module_invoke_all() {
|
|||
* Array of modules required by core.
|
||||
*/
|
||||
function drupal_required_modules() {
|
||||
return array('block', 'filter', 'node', 'system', 'user', 'watchdog');
|
||||
return array('block', 'filter', 'node', 'system', 'user');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
/* $Id$ */
|
||||
|
||||
tr.dblog-user {
|
||||
background: #ffd;
|
||||
}
|
||||
tr.dblog-user .active {
|
||||
background: #eed;
|
||||
}
|
||||
tr.dblog-content {
|
||||
background: #ddf;
|
||||
}
|
||||
tr.dblog-content .active {
|
||||
background: #cce;
|
||||
}
|
||||
tr.dblog-page-not-found, tr.dblog-access-denied {
|
||||
background: #dfd;
|
||||
}
|
||||
tr.dblog-page-not-found .active, tr.dblog-access-denied .active {
|
||||
background: #cec;
|
||||
}
|
||||
tr.dblog-error {
|
||||
background: #ffc9c9;
|
||||
}
|
||||
tr.dblog-error .active {
|
||||
background: #eeb9b9;
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
; $Id$
|
||||
name = Database logging
|
||||
description = Logs and records system events to the database.
|
||||
package = Core - optional
|
||||
version = VERSION
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
// $Id$
|
||||
|
||||
/**
|
||||
* Implementation of hook_install().
|
||||
*/
|
||||
function dblog_install() {
|
||||
switch ($GLOBALS['db_type']) {
|
||||
case 'mysql':
|
||||
case 'mysqli':
|
||||
db_query("CREATE TABLE {watchdog} (
|
||||
wid int NOT NULL auto_increment,
|
||||
uid int NOT NULL default '0',
|
||||
type varchar(16) NOT NULL default '',
|
||||
message longtext NOT NULL,
|
||||
severity tinyint unsigned NOT NULL default '0',
|
||||
link varchar(255) NOT NULL default '',
|
||||
location text NOT NULL,
|
||||
referer varchar(128) NOT NULL default '',
|
||||
hostname varchar(128) NOT NULL default '',
|
||||
timestamp int NOT NULL default '0',
|
||||
PRIMARY KEY (wid),
|
||||
KEY (type)
|
||||
) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
|
||||
break;
|
||||
|
||||
case 'pgsql':
|
||||
db_query("CREATE TABLE {watchdog} (
|
||||
wid serial,
|
||||
uid int NOT NULL default '0',
|
||||
type varchar(16) NOT NULL default '',
|
||||
message text NOT NULL,
|
||||
severity smallint_unsigned NOT NULL default '0',
|
||||
link varchar(255) NOT NULL default '',
|
||||
location text NOT NULL default '',
|
||||
referer varchar(128) NOT NULL default '',
|
||||
hostname varchar(128) NOT NULL default '',
|
||||
timestamp int NOT NULL default '0',
|
||||
PRIMARY KEY (wid)
|
||||
)");
|
||||
db_query("CREATE INDEX {watchdog}_type_idx ON {watchdog} (type)");
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_uninstall().
|
||||
*/
|
||||
function dblog_uninstall() {
|
||||
db_query('DROP TABLE {watchdog}');
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
* @file
|
||||
* System monitoring and logging for administrators.
|
||||
*
|
||||
* The watchdog module monitors your site and keeps a list of
|
||||
* The dblog module monitors your site and keeps a list of
|
||||
* recorded events containing usage and performance data, errors,
|
||||
* warnings, and similar operational information.
|
||||
*
|
||||
|
|
@ -15,24 +15,24 @@
|
|||
/**
|
||||
* Implementation of hook_help().
|
||||
*/
|
||||
function watchdog_help($section) {
|
||||
function dblog_help($section) {
|
||||
switch ($section) {
|
||||
case 'admin/help#watchdog':
|
||||
$output = '<p>'. t('The watchdog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time. This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') .'</p>';
|
||||
$output .= '<p>'. t('The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the watchdog report on a regular basis to ensure their site is working properly.') .'</p>';
|
||||
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@watchdog">Watchdog page</a>.', array('@watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'</p>';
|
||||
case 'admin/help#dblog':
|
||||
$output = '<p>'. t('The dblog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time. This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') .'</p>';
|
||||
$output .= '<p>'. t('The dblog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the dblog report on a regular basis to ensure their site is working properly.') .'</p>';
|
||||
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@dblog">Dblog page</a>.', array('@dblog' => 'http://drupal.org/handbook/modules/dblog/')) .'</p>';
|
||||
return $output;
|
||||
case 'admin/logs':
|
||||
return '<p>'. t('The watchdog module monitors your website, capturing system events in a log to be reviewed by an authorized individual at a later time. The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.') .'</p>';
|
||||
return '<p>'. t('The dblog module monitors your website, capturing system events in a log to be reviewed by an authorized individual at a later time. The dblog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the dblog report on a regular basis as it is often the only way to tell what is going on.') .'</p>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_theme()
|
||||
*/
|
||||
function watchdog_theme() {
|
||||
function dblog_theme() {
|
||||
return array(
|
||||
'watchdog_form_overview' => array(
|
||||
'dblog_form_overview' => array(
|
||||
'arguments' => array('form' => NULL),
|
||||
),
|
||||
);
|
||||
|
|
@ -41,75 +41,102 @@ function watchdog_theme() {
|
|||
/**
|
||||
* Implementation of hook_menu().
|
||||
*/
|
||||
function watchdog_menu() {
|
||||
$items['admin/logs/watchdog'] = array(
|
||||
function dblog_menu() {
|
||||
$items['admin/settings/logging/dblog'] = array(
|
||||
'title' => t('Database logging'),
|
||||
'description' => t('Settings for logging to the Drupal database logs.'),
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('dblog_admin_settings'),
|
||||
);
|
||||
|
||||
$items['admin/logs/dblog'] = array(
|
||||
'title' => t('Recent log entries'),
|
||||
'description' => t('View events that have recently been logged.'),
|
||||
'page callback' => 'watchdog_overview',
|
||||
'page callback' => 'dblog_overview',
|
||||
'weight' => -1,
|
||||
);
|
||||
$items['admin/logs/page-not-found'] = array(
|
||||
'title' => t("Top 'page not found' errors"),
|
||||
'description' => t("View 'page not found' errors (404s)."),
|
||||
'page callback' => 'watchdog_top',
|
||||
'page callback' => 'dblog_top',
|
||||
'page arguments' => array('page not found'),
|
||||
);
|
||||
$items['admin/logs/access-denied'] = array(
|
||||
'title' => t("Top 'access denied' errors"),
|
||||
'description' => t("View 'access denied' errors (403s)."),
|
||||
'page callback' => 'watchdog_top',
|
||||
'page callback' => 'dblog_top',
|
||||
'page arguments' => array('access denied'),
|
||||
);
|
||||
$items['admin/logs/event/%'] = array(
|
||||
'title' => t('Details'),
|
||||
'page callback' => 'watchdog_event',
|
||||
'page callback' => 'dblog_event',
|
||||
'page arguments' => array(3),
|
||||
'type' => MENU_CALLBACK,
|
||||
);
|
||||
return $items;
|
||||
}
|
||||
|
||||
function watchdog_init() {
|
||||
function dblog_init() {
|
||||
if (arg(0) == 'admin' && arg(1) == 'logs') {
|
||||
// Add the CSS for this module
|
||||
drupal_add_css(drupal_get_path('module', 'watchdog') .'/watchdog.css', 'module', 'all', FALSE);
|
||||
drupal_add_css(drupal_get_path('module', 'dblog') .'/dblog.css', 'module', 'all', FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
function dblog_admin_settings() {
|
||||
$form['dblog_row_limit'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Discard log entries above the following row limit'),
|
||||
'#default_value' => variable_get('dblog_row_limit', 1000),
|
||||
'#options' => drupal_map_assoc(array(100, 1000, 10000, 100000, 1000000)),
|
||||
'#description' => t('The maximum number of rows to keep in the database log. Older entries will be automatically discarded. Requires crontab.')
|
||||
);
|
||||
|
||||
return system_settings_form($form);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_cron().
|
||||
*
|
||||
* Remove expired log messages and flood control events.
|
||||
*/
|
||||
function watchdog_cron() {
|
||||
db_query('DELETE FROM {watchdog} WHERE timestamp < %d', time() - variable_get('watchdog_clear', 604800));
|
||||
db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600);
|
||||
function dblog_cron() {
|
||||
// Cleanup the watchdog table
|
||||
$min = db_result(db_query('SELECT MIN(wid) FROM {watchdog}'));
|
||||
if ($min) {
|
||||
$max = db_result(db_query('SELECT MAX(wid) FROM {watchdog}'));
|
||||
if ($max) {
|
||||
if (($max - $min) > variable_get('dblog_row_limit', 1000)) {
|
||||
db_query('DELETE FROM {watchdog} WHERE wid < %d', $max - $min);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_user().
|
||||
*/
|
||||
function watchdog_user($op, &$edit, &$user) {
|
||||
function dblog_user($op, &$edit, &$user) {
|
||||
if ($op == 'delete') {
|
||||
db_query('UPDATE {watchdog} SET uid = 0 WHERE uid = %d', $user->uid);
|
||||
}
|
||||
}
|
||||
|
||||
function watchdog_form_overview() {
|
||||
function dblog_form_overview() {
|
||||
$names['all'] = t('all messages');
|
||||
foreach (_watchdog_get_message_types() as $type) {
|
||||
foreach (_dblog_get_message_types() as $type) {
|
||||
$names[$type] = t('!type messages', array('!type' => t($type)));
|
||||
}
|
||||
|
||||
if (empty($_SESSION['watchdog_overview_filter'])) {
|
||||
$_SESSION['watchdog_overview_filter'] = 'all';
|
||||
if (empty($_SESSION['dblog_overview_filter'])) {
|
||||
$_SESSION['dblog_overview_filter'] = 'all';
|
||||
}
|
||||
|
||||
$form['filter'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Filter by message type'),
|
||||
'#options' => $names,
|
||||
'#default_value' => $_SESSION['watchdog_overview_filter']
|
||||
'#default_value' => $_SESSION['dblog_overview_filter']
|
||||
);
|
||||
$form['submit'] = array('#type' => 'submit', '#value' => t('Filter'));
|
||||
$form['#redirect'] = FALSE;
|
||||
|
|
@ -119,13 +146,14 @@ function watchdog_form_overview() {
|
|||
/**
|
||||
* Menu callback; displays a listing of log messages.
|
||||
*/
|
||||
function watchdog_overview() {
|
||||
function dblog_overview() {
|
||||
$rows = array();
|
||||
$icons = array(WATCHDOG_NOTICE => '',
|
||||
WATCHDOG_WARNING => theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning')),
|
||||
WATCHDOG_ERROR => theme('image', 'misc/watchdog-error.png', t('error'), t('error')));
|
||||
$classes = array(WATCHDOG_NOTICE => 'watchdog-notice', WATCHDOG_WARNING => 'watchdog-warning', WATCHDOG_ERROR => 'watchdog-error');
|
||||
$classes = array(WATCHDOG_NOTICE => 'dblog-notice', WATCHDOG_WARNING => 'dblog-warning', WATCHDOG_ERROR => 'dblog-error');
|
||||
|
||||
$output = drupal_get_form('watchdog_form_overview');
|
||||
$output = drupal_get_form('dblog_form_overview');
|
||||
|
||||
$header = array(
|
||||
' ',
|
||||
|
|
@ -138,7 +166,7 @@ function watchdog_overview() {
|
|||
|
||||
$sql = "SELECT w.wid, w.uid, w.severity, w.type, w.timestamp, w.message, w.link, u.name FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid";
|
||||
$tablesort = tablesort_sql($header);
|
||||
$type = $_SESSION['watchdog_overview_filter'];
|
||||
$type = $_SESSION['dblog_overview_filter'];
|
||||
if ($type != 'all') {
|
||||
$result = pager_query($sql ." WHERE w.type = '%s'". $tablesort, 50, 0, NULL, $type);
|
||||
}
|
||||
|
|
@ -146,19 +174,19 @@ function watchdog_overview() {
|
|||
$result = pager_query($sql . $tablesort, 50);
|
||||
}
|
||||
|
||||
while ($watchdog = db_fetch_object($result)) {
|
||||
while ($dblog = db_fetch_object($result)) {
|
||||
$rows[] = array('data' =>
|
||||
array(
|
||||
// Cells
|
||||
$icons[$watchdog->severity],
|
||||
t($watchdog->type),
|
||||
format_date($watchdog->timestamp, 'small'),
|
||||
l(truncate_utf8($watchdog->message, 56, TRUE, TRUE), 'admin/logs/event/'. $watchdog->wid, array('html' => TRUE)),
|
||||
theme('username', $watchdog),
|
||||
$watchdog->link,
|
||||
$icons[$dblog->severity],
|
||||
t($dblog->type),
|
||||
format_date($dblog->timestamp, 'small'),
|
||||
l(truncate_utf8($dblog->message, 56, TRUE, TRUE), 'admin/logs/event/'. $dblog->wid, array('html' => TRUE)),
|
||||
theme('username', $dblog),
|
||||
$dblog->link,
|
||||
),
|
||||
// Attributes for tr
|
||||
'class' => "watchdog-". preg_replace('/[^a-z]/i', '-', $watchdog->type) .' '. $classes[$watchdog->severity]
|
||||
'class' => "dblog-". preg_replace('/[^a-z]/i', '-', $dblog->type) .' '. $classes[$dblog->severity]
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -174,9 +202,9 @@ function watchdog_overview() {
|
|||
|
||||
/**
|
||||
* Menu callback; generic function to display a page of the most frequent
|
||||
* watchdog events of a specified type.
|
||||
* dblog events of a specified type.
|
||||
*/
|
||||
function watchdog_top($type) {
|
||||
function dblog_top($type) {
|
||||
|
||||
$header = array(
|
||||
array('data' => t('Count'), 'field' => 'count', 'sort' => 'desc'),
|
||||
|
|
@ -186,8 +214,8 @@ function watchdog_top($type) {
|
|||
$result = pager_query("SELECT COUNT(wid) AS count, message FROM {watchdog} WHERE type = '%s' GROUP BY message ". tablesort_sql($header), 30, 0, "SELECT COUNT(DISTINCT(message)) FROM {watchdog} WHERE type = '%s'", $type);
|
||||
|
||||
$rows = array();
|
||||
while ($watchdog = db_fetch_object($result)) {
|
||||
$rows[] = array($watchdog->count, truncate_utf8($watchdog->message, 56, TRUE, TRUE));
|
||||
while ($dblog = db_fetch_object($result)) {
|
||||
$rows[] = array($dblog->count, truncate_utf8($dblog->message, 56, TRUE, TRUE));
|
||||
}
|
||||
|
||||
if (empty($rows)) {
|
||||
|
|
@ -200,67 +228,67 @@ function watchdog_top($type) {
|
|||
return $output;
|
||||
}
|
||||
|
||||
function theme_watchdog_form_overview($form) {
|
||||
function theme_dblog_form_overview($form) {
|
||||
return '<div class="container-inline">'. drupal_render($form) .'</div>';
|
||||
}
|
||||
|
||||
function watchdog_form_overview_submit($form_id, $form_values) {
|
||||
$_SESSION['watchdog_overview_filter'] = $form_values['filter'];
|
||||
function dblog_form_overview_submit($form_id, $form_values) {
|
||||
$_SESSION['dblog_overview_filter'] = $form_values['filter'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Menu callback; displays details about a log message.
|
||||
*/
|
||||
function watchdog_event($id) {
|
||||
function dblog_event($id) {
|
||||
$severity = array(WATCHDOG_NOTICE => t('notice'), WATCHDOG_WARNING => t('warning'), WATCHDOG_ERROR => t('error'));
|
||||
$output = '';
|
||||
$result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
|
||||
if ($watchdog = db_fetch_object($result)) {
|
||||
if ($dblog = db_fetch_object($result)) {
|
||||
$rows = array(
|
||||
array(
|
||||
array('data' => t('Type'), 'header' => TRUE),
|
||||
t($watchdog->type),
|
||||
t($dblog->type),
|
||||
),
|
||||
array(
|
||||
array('data' => t('Date'), 'header' => TRUE),
|
||||
format_date($watchdog->timestamp, 'large'),
|
||||
format_date($dblog->timestamp, 'large'),
|
||||
),
|
||||
array(
|
||||
array('data' => t('User'), 'header' => TRUE),
|
||||
theme('username', $watchdog),
|
||||
theme('username', $dblog),
|
||||
),
|
||||
array(
|
||||
array('data' => t('Location'), 'header' => TRUE),
|
||||
l($watchdog->location, $watchdog->location),
|
||||
l($dblog->location, $dblog->location),
|
||||
),
|
||||
array(
|
||||
array('data' => t('Referrer'), 'header' => TRUE),
|
||||
l($watchdog->referer, $watchdog->referer),
|
||||
l($dblog->referer, $dblog->referer),
|
||||
),
|
||||
array(
|
||||
array('data' => t('Message'), 'header' => TRUE),
|
||||
$watchdog->message,
|
||||
$dblog->message,
|
||||
),
|
||||
array(
|
||||
array('data' => t('Severity'), 'header' => TRUE),
|
||||
$severity[$watchdog->severity],
|
||||
$severity[$dblog->severity],
|
||||
),
|
||||
array(
|
||||
array('data' => t('Hostname'), 'header' => TRUE),
|
||||
$watchdog->hostname,
|
||||
$dblog->hostname,
|
||||
),
|
||||
array(
|
||||
array('data' => t('Operations'), 'header' => TRUE),
|
||||
$watchdog->link,
|
||||
$dblog->link,
|
||||
),
|
||||
);
|
||||
$attributes = array('class' => 'watchdog-event');
|
||||
$attributes = array('class' => 'dblog-event');
|
||||
$output = theme('table', array(), $rows, $attributes);
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
||||
function _watchdog_get_message_types() {
|
||||
function _dblog_get_message_types() {
|
||||
$types = array();
|
||||
|
||||
$result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type');
|
||||
|
|
@ -270,3 +298,24 @@ function _watchdog_get_message_types() {
|
|||
|
||||
return $types;
|
||||
}
|
||||
|
||||
function dblog_watchdog($log = array()) {
|
||||
$current_db = db_set_active();
|
||||
db_query("INSERT INTO {watchdog}
|
||||
(uid, type, message, severity, link, location, referer, hostname, timestamp)
|
||||
VALUES
|
||||
(%d, '%s', '%s', %d, '%s', '%s', '%s', '%s', %d)",
|
||||
$log['user']->uid,
|
||||
$log['type'],
|
||||
$log['message'],
|
||||
$log['severity'],
|
||||
$log['link'],
|
||||
$log['request_uri'],
|
||||
$log['referer'],
|
||||
$log['ip'],
|
||||
$log['timestamp']);
|
||||
|
||||
if ($current_db) {
|
||||
db_set_active($current_db);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
; $Id$
|
||||
name = Syslog
|
||||
description = Logs and records system events to syslog.
|
||||
package = Core - optional
|
||||
version = VERSION
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
<?php
|
||||
// $Id$
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Redirects logging messages to syslog.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implementation of hook_help().
|
||||
*/
|
||||
function syslog_help($section) {
|
||||
switch ($section) {
|
||||
case 'admin/help#syslog':
|
||||
return '<p>'. t('Provides the facility to log Drupal messages to the operating systems\' syslog facility.') .'</p>';
|
||||
}
|
||||
}
|
||||
|
||||
function syslog_menu() {
|
||||
$items['admin/settings/logging/syslog'] = array(
|
||||
'title' => t('Syslog'),
|
||||
'description' => t('Settings for syslog logging.'),
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('syslog_admin_settings'),
|
||||
);
|
||||
return $items;
|
||||
}
|
||||
|
||||
function syslog_admin_settings() {
|
||||
$form['syslog_faclity'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Syslog facility to send to'),
|
||||
'#default_value' => variable_get('syslog_faclity', LOG_LOCAL0),
|
||||
'#options' => syslog_facility_list(),
|
||||
'#description' => t('Select the syslog facility to send Drupal\'s messages to. For more information on syslog facilities, See !syslog_conf and !php', array(
|
||||
'!php' => l("PHP's syslog", 'http://www.php.net/manual/en/function.openlog.php'),
|
||||
'!syslog_conf' => l('UNIX/Linux syslog.conf', 'http://www.rt.com/man/syslog.5.html'),
|
||||
)),
|
||||
);
|
||||
return system_settings_form($form);
|
||||
}
|
||||
|
||||
function syslog_facility_list() {
|
||||
return array(
|
||||
LOG_USER => t('LOG_USER - User level messages. Use this for Windows.'),
|
||||
LOG_LOCAL0 => t('LOG_LOCAL0 - Local 0'),
|
||||
LOG_LOCAL1 => t('LOG_LOCAL1 - Local 1'),
|
||||
LOG_LOCAL2 => t('LOG_LOCAL2 - Local 2'),
|
||||
LOG_LOCAL3 => t('LOG_LOCAL3 - Local 3'),
|
||||
LOG_LOCAL4 => t('LOG_LOCAL4 - Local 4'),
|
||||
LOG_LOCAL5 => t('LOG_LOCAL5 - Local 5'),
|
||||
LOG_LOCAL6 => t('LOG_LOCAL6 - Local 6'),
|
||||
LOG_LOCAL7 => t('LOG_LOCAL7 - Local 7'),
|
||||
);
|
||||
}
|
||||
|
||||
function syslog_watchdog($entry) {
|
||||
static $log_init = FALSE;
|
||||
|
||||
if (!$log_init) {
|
||||
$log_init = TRUE;
|
||||
openlog('drupal', LOG_NDELAY, variable_get('syslog_faclity', LOG_LOCAL0));
|
||||
}
|
||||
|
||||
syslog($entry['severity'], theme('syslog_format', $entry));
|
||||
}
|
||||
|
||||
function syslog_theme() {
|
||||
return array(
|
||||
'syslog_format' => array(
|
||||
'arguments' => array('entry' => NULL),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
function theme_syslog_format($entry) {
|
||||
global $base_url;
|
||||
|
||||
$message = t('@base_url|@timestamp|@type|@uid|@ip|@request_uri|@referer_uri|@link|@message',
|
||||
array(
|
||||
'@base_url' => $base_url,
|
||||
'@timestamp' => $entry['timestamp'],
|
||||
'@type' => $entry['type'],
|
||||
'@ip' => $entry['ip'],
|
||||
'@request_uri' => $entry['request_uri'],
|
||||
'@referer_uri' => $entry['referer'],
|
||||
'@uid' => $entry['user']->uid,
|
||||
'@link' => strip_tags($entry['link']),
|
||||
'@message' => strip_tags($entry['message']),
|
||||
));
|
||||
return $message;
|
||||
}
|
||||
|
|
@ -603,21 +603,6 @@ function system_install() {
|
|||
PRIMARY KEY (vid, type)
|
||||
) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
|
||||
|
||||
db_query("CREATE TABLE {watchdog} (
|
||||
wid int NOT NULL auto_increment,
|
||||
uid int NOT NULL default '0',
|
||||
type varchar(16) NOT NULL default '',
|
||||
message longtext NOT NULL,
|
||||
severity tinyint unsigned NOT NULL default '0',
|
||||
link varchar(255) NOT NULL default '',
|
||||
location text NOT NULL,
|
||||
referer varchar(128) NOT NULL default '',
|
||||
hostname varchar(128) NOT NULL default '',
|
||||
timestamp int NOT NULL default '0',
|
||||
PRIMARY KEY (wid),
|
||||
KEY (type)
|
||||
) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
|
||||
|
||||
break;
|
||||
case 'pgsql':
|
||||
/* create unsigned types */
|
||||
|
|
@ -1089,20 +1074,6 @@ function system_install() {
|
|||
PRIMARY KEY (vid, type)
|
||||
)");
|
||||
|
||||
db_query("CREATE TABLE {watchdog} (
|
||||
wid serial,
|
||||
uid int NOT NULL default '0',
|
||||
type varchar(16) NOT NULL default '',
|
||||
message text NOT NULL,
|
||||
severity smallint_unsigned NOT NULL default '0',
|
||||
link varchar(255) NOT NULL default '',
|
||||
location text NOT NULL default '',
|
||||
referer varchar(128) NOT NULL default '',
|
||||
hostname varchar(128) NOT NULL default '',
|
||||
timestamp int NOT NULL default '0',
|
||||
PRIMARY KEY (wid)
|
||||
)");
|
||||
db_query("CREATE INDEX {watchdog}_type_idx ON {watchdog} (type)");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -3723,6 +3694,17 @@ function system_update_2006() {
|
|||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Change the severity column in the watchdog table to the new values.
|
||||
*/
|
||||
function system_update_2007() {
|
||||
$ret = array();
|
||||
$ret[] = update_sql("UPDATE {watchdog} SET severity = %d WHERE severity = 0", WATCHDOG_NOTICE);
|
||||
$ret[] = update_sql("UPDATE {watchdog} SET severity = %d WHERE severity = 1", WATCHDOG_WARNING);
|
||||
$ret[] = update_sql("UPDATE {watchdog} SET severity = %d WHERE severity = 2", WATCHDOG_ERROR);
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* @} End of "defgroup updates-5.0-to-x.x"
|
||||
* The next series of updates should start at 3000.
|
||||
|
|
|
|||
|
|
@ -249,6 +249,11 @@ function system_menu() {
|
|||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('system_error_reporting_settings'),
|
||||
);
|
||||
$items['admin/settings/logging'] = array(
|
||||
'title' => t('Logging and alerts'),
|
||||
'description' => t('Settings for logging and alerts modules'),
|
||||
'page callback' => 'system_logging_overview',
|
||||
);
|
||||
$items['admin/settings/performance'] = array(
|
||||
'title' => t('Performance'),
|
||||
'description' => t('Enable or disable page caching for anonymous users, and enable or disable CSS preprocessor.'),
|
||||
|
|
@ -669,16 +674,6 @@ function system_error_reporting_settings() {
|
|||
'#description' => t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')
|
||||
);
|
||||
|
||||
$period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
|
||||
$period['1000000000'] = t('Never');
|
||||
$form['watchdog_clear'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Discard log entries older than'),
|
||||
'#default_value' => variable_get('watchdog_clear', 604800),
|
||||
'#options' => $period,
|
||||
'#description' => t('The time log entries should be kept. Older entries will be automatically discarded. Requires crontab.')
|
||||
);
|
||||
|
||||
return system_settings_form($form);
|
||||
}
|
||||
|
||||
|
|
@ -1953,6 +1948,14 @@ function system_settings_overview() {
|
|||
return $output;
|
||||
}
|
||||
|
||||
function system_logging_overview() {
|
||||
$item = menu_get_item('admin/settings/logging');
|
||||
$content = system_admin_menu_block($item);
|
||||
|
||||
$output = theme('admin_block_content', $content);
|
||||
|
||||
return $output;
|
||||
}
|
||||
/**
|
||||
* Menu callback; display theme configuration for entire site and individual themes.
|
||||
*/
|
||||
|
|
@ -2431,3 +2434,14 @@ function theme_system_admin_by_module($menu_items) {
|
|||
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of hook_cron().
|
||||
*
|
||||
* Remove older rows from flood table
|
||||
*/
|
||||
function system_cron() {
|
||||
// Cleanup the flood
|
||||
db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
/* $Id$ */
|
||||
|
||||
tr.watchdog-user {
|
||||
background: #ffd;
|
||||
}
|
||||
tr.watchdog-user .active {
|
||||
background: #eed;
|
||||
}
|
||||
tr.watchdog-content {
|
||||
background: #ddf;
|
||||
}
|
||||
tr.watchdog-content .active {
|
||||
background: #cce;
|
||||
}
|
||||
tr.watchdog-page-not-found, tr.watchdog-access-denied {
|
||||
background: #dfd;
|
||||
}
|
||||
tr.watchdog-page-not-found .active, tr.watchdog-access-denied .active {
|
||||
background: #cec;
|
||||
}
|
||||
tr.watchdog-error {
|
||||
background: #ffc9c9;
|
||||
}
|
||||
tr.watchdog-error .active {
|
||||
background: #eeb9b9;
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
; $Id$
|
||||
name = Watchdog
|
||||
description = Logs and records system events.
|
||||
package = Core - required
|
||||
version = VERSION
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* An array of modules to be enabled.
|
||||
*/
|
||||
function default_profile_modules() {
|
||||
return array('color', 'comment', 'help', 'taxonomy');
|
||||
return array('color', 'comment', 'help', 'taxonomy', 'dblog');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue