Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.111 diff -u -F^f -r1.111 bootstrap.inc --- includes/bootstrap.inc 7 Aug 2006 15:04:13 -0000 1.111 +++ includes/bootstrap.inc 8 Aug 2006 10:59:23 -0000 @@ -341,11 +341,16 @@ function page_get_cache() { * @param $hook * The name of the bootstrap hook we wish to invoke. */ -function bootstrap_invoke_all($hook) { +function bootstrap_invoke_all() { + $args = func_get_args(); + $hook = array_shift($args); foreach (module_list(TRUE, TRUE) as $module) { drupal_load('module', $module); - module_invoke($module, $hook); - } + $function = $module .'_'. $hook; + if (function_exists($function)) { + call_user_func_array($function, $args); + } + } } /** @@ -460,7 +465,7 @@ function drupal_page_header() { * Define the critical hooks that force modules to always be loaded. */ function bootstrap_hooks() { - return array('init', 'exit'); + return array('init', 'exit', 'watchdog'); } /** @@ -535,18 +540,7 @@ function request_uri() { * 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(); - - // 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); - } + bootstrap_invoke_all('watchdog', $type, $message, $severity, $link); } /** Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.338 diff -u -F^f -r1.338 system.module --- modules/system/system.module 7 Aug 2006 19:35:41 -0000 1.338 +++ modules/system/system.module 8 Aug 2006 10:59:24 -0000 @@ -1173,7 +1173,7 @@ function system_modules() { // Handle status checkboxes, including overriding the generated // checkboxes for required modules. $form['status'] = array('#type' => 'checkboxes', '#default_value' => $status, '#options' => $options); - $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog'); + $required = array('block', 'filter', 'node', 'system', 'user'); foreach ($required as $require) { $form['status'][$require] = array('#type' => 'hidden', '#value' => 1, '#suffix' => t('required')); } Index: modules/watchdog/watchdog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/watchdog/watchdog.module,v retrieving revision 1.146 diff -u -F^f -r1.146 watchdog.module --- modules/watchdog/watchdog.module 7 Aug 2006 15:04:16 -0000 1.146 +++ modules/watchdog/watchdog.module 8 Aug 2006 10:59:24 -0000 @@ -22,14 +22,14 @@ function watchdog_help($section) { $output .= '

'. 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.') .'

'; $output .= t('

You can

-', array('%admin-watchdog' => url('admin/logs/watchdog'), '%admin-watchdog-events' => url('admin/logs/watchdog/events'))); +', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events'))); $output .= '

'. t('For more information please read the configuration and customization handbook Watchdog page.', array('%watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'

'; return $output; case 'admin/settings/modules#description': - return t('Logs and records system events.'); + return t('Logs and records system events in the database.'); case 'admin/logs': return t('

The watchdog module monitors your web site, 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.

'); } @@ -55,147 +55,27 @@ function watchdog_menu($may_cache) { 'callback' => 'watchdog_event', 'type' => MENU_CALLBACK); } - return $items; -} - -/** - * 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); -} - -/** - * Implementation of hook_user(). - */ -function watchdog_user($op, &$edit, &$user) { - if ($op == 'delete') { - db_query('UPDATE {watchdog} SET uid = 0 WHERE uid = %d', $user->uid); - } -} - -/** - * Menu callback; displays a listing of log messages. - */ -function watchdog_overview() { - $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'); - - $names['all'] = t('all messages'); - foreach (_watchdog_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'; - } - - $form['filter'] = array( - '#type' => 'select', - '#title' => t('Filter by message type'), - '#options' => $names, - '#default_value' => $_SESSION['watchdog_overview_filter'] - ); - $form['#action'] = url('admin/logs'); - - $form['submit'] = array('#type' => 'submit', '#value' =>t('Filter')); - $output = drupal_get_form('watchdog_form_overview', $form); - - $header = array( - ' ', - array('data' => t('Type'), 'field' => 'w.type'), - array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'), - array('data' => t('Message'), 'field' => 'w.message'), - array('data' => t('User'), 'field' => 'u.name'), - array('data' => t('Operations')) - ); - - $sql = "SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid"; - $tablesort = tablesort_sql($header); - $type = $_SESSION['watchdog_overview_filter']; - if ($type != 'all') { - $result = pager_query($sql ." WHERE w.type = '%s'". $tablesort, 50, 0, NULL, $type); - } else { - $result = pager_query($sql . $tablesort, 50); - } - - while ($watchdog = 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(), NULL, NULL, FALSE, TRUE), - theme('username', $watchdog), - $watchdog->link, - ), - // Attributes for tr - 'class' => "watchdog-". preg_replace('/[^a-z]/i', '-', $watchdog->type) .' '. $classes[$watchdog->severity] - ); + // We only want the rest of the watchdog module on full bootstrap, not cached pages + include_once './'. drupal_get_path('module', 'watchdog') .'/watchdog.inc'; } - - if (!$rows) { - $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 6)); - } - - $output .= theme('table', $header, $rows); - $output .= theme('pager', NULL, 50, 0); - - return $output; -} - -function theme_watchdog_form_overview($form) { - return '
'. form_render($form) .'
'; -} - -function watchdog_form_overview_submit($form_id, $form) { - global $form_values; - $_SESSION['watchdog_overview_filter'] = $form_values['filter']; + return $items; } /** - * Menu callback; displays details about a log message. + * Implementation of hook_watchdog(). + * + * Logs a watchdog event in the database. */ -function watchdog_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)) { - $header = array(t('Type'), t('Date'), t('User'), t('Location'), t('Referrer'), t('Message'), t('Severity'), t('Hostname')); - $data = array(t($watchdog->type), format_date($watchdog->timestamp, 'large'), theme('username', $watchdog), l($watchdog->location, $watchdog->location), l($watchdog->referer, $watchdog->referer), $watchdog->message, $severity[$watchdog->severity], $watchdog->hostname); - $output = theme('watchdog_event', $header, $data); - } - return $output; -} +function watchdog_watchdog($type, $message, $severity = WATCHDOG_NOTICE, $link = NULL) { + global $user, $base_root; -function theme_watchdog_event($header, $data) { - $output = ''; - $output .= ''; + $current_db = db_set_active(); - $n = count($header); - for ($i = 0; $i < $n; $i++) { - $output .= ''; + // 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); } - - $output .= '
' . $header[$i] . '' . $data[$i] . '
'; - - return $output; -} - -function _watchdog_get_message_types() { - $types = array(); - - $result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type'); - while ($object = db_fetch_object($result)) { - $types[] = $object->type; - } - - return $types; -} +} \ No newline at end of file