? files
? hook_watchdog.patch
? hook_watchdog_bootstrap.patch
? test.php
? includes/watchdog.inc
? modules/rawlog
? sites/HEAD
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.99
diff -u -r1.99 bootstrap.inc
--- includes/bootstrap.inc	7 May 2006 00:08:36 -0000	1.99
+++ includes/bootstrap.inc	17 May 2006 17:29:09 -0000
@@ -455,11 +455,16 @@
  * @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(FALSE, TRUE) as $module) {
     drupal_load('module', $module);
-    module_invoke($module, $hook);
- }
+    $function = $module .'_'. $hook;
+    if (function_exists($function)) {
+      call_user_func_array($function, $args);
+    }
+  }
 }
 
 /**
@@ -561,7 +566,7 @@
  * Define the critical hooks that force modules to always be loaded.
  */
 function bootstrap_hooks() {
-  return array('init', 'exit');
+  return array('init', 'exit', 'watchdog');
 }
 
 /**
@@ -636,18 +641,7 @@
  *   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/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.144
diff -u -r1.144 watchdog.module
--- modules/watchdog.module	7 May 2006 00:08:36 -0000	1.144
+++ modules/watchdog.module	17 May 2006 17:29:09 -0000
@@ -12,28 +12,7 @@
  * @see watchdog().
  */
 
-/**
- * Implementation of hook_help().
- */
-function watchdog_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 .= t('<p>You can</p>
-<ul>
-<li>view watchdog logs at <a href="%admin-watchdog">administer &gt;&gt; watchdog</a>.</li>
-<li>view watchdog event logs at <a href="%admin-watchdog-events">administer &gt;&gt; watchdog &gt;&gt; events</a>.</li>
-</ul>
-', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events')));
-      $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>';
-      return $output;
-    case 'admin/modules#description':
-      return t('Logs and records system events.');
-    case 'admin/logs':
-      return t('<p>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.</p>');
-  }
-}
+
 
 /**
  * Implementation of hook_menu().
@@ -48,147 +27,29 @@
       '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);
+    // We only want the rest of the watchdog module on full bootstrap, not cached pages
+    require_once './includes/watchdog.inc';
   }
-
-  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]
-    );
-  }
-
-  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 '<div class="container-inline">'. form_render($form) .'</div>';
-}
-
-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 .= '<table class="watchdog-event">';
-
-  $n = count($header);
-  for ($i = 0; $i < $n; $i++) {
-    $output .= '<tr class="' . ($i % 2 == 0 ? 'even' : 'odd') . '"><th>' . $header[$i] . '</th><td>' . $data[$i] . '</td></tr>';
-  }
-
-  $output .= '</table>';
+  $current_db = db_set_active();
 
-  return $output;
-}
+  // Note: log the exact, entire absolute URL.
+  $request_uri = $base_root . request_uri();
 
-function _watchdog_get_message_types() {
-  $types = array();
+  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());
 
-  $result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type');
-  while ($object = db_fetch_object($result)) {
-    $types[] = $object->type;
+  if ($current_db) {
+    db_set_active($current_db);
   }
-
-  return $types;
-}
+}
\ No newline at end of file
