Index: modules/dblog/dblog.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.install,v
retrieving revision 1.20
diff -u -r1.20 dblog.install
--- modules/dblog/dblog.install	4 Dec 2009 16:49:46 -0000	1.20
+++ modules/dblog/dblog.install	30 Dec 2009 20:35:20 -0000
@@ -81,6 +81,20 @@
         'default' => 0,
         'description' => 'Unix timestamp of when event occurred.',
       ),
+      'server_addr' => array(
+        'type' => 'varchar',
+        'length' => 128,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => 'IP address of the server who triggered the event.',
+      ),
+      'server_name' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => 'Name of the server who triggered the event.',
+      ),
     ),
     'primary key' => array('wid'),
     'indexes' => array(
@@ -137,6 +151,14 @@
 }
 
 /**
+ * Add new fields server_addr and server_name.
+ */
+function dblog_update_7004() {
+  db_add_field('watchdog', 'server_addr', array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '', 'description' => 'IP address of the server who triggered the event.', 'initial' => ''));
+  db_add_field('watchdog', 'server_name', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'Name of the server who triggered the event.', 'initial' => ''));
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.32
diff -u -r1.32 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	2 Dec 2009 14:56:32 -0000	1.32
+++ modules/dblog/dblog.admin.inc	30 Dec 2009 20:35:20 -0000
@@ -42,13 +42,14 @@
     array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
     t('Message'),
     array('data' => t('User'), 'field' => 'u.name'),
+    array('data' => t('Server')),
     array('data' => t('Operations')),
   );
 
   $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort');
   $query->join('users', 'u', 'w.uid = u.uid');
   $query
-    ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link'))
+    ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link', 'server_addr', 'server_name'))
     ->addField('u', 'name');
   if (!empty($filter['where'])) {
     $query->where($filter['where'], $filter['args']);
@@ -67,6 +68,7 @@
         format_date($dblog->timestamp, 'short'),
         l(truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/reports/event/' . $dblog->wid, array('html' => TRUE)),
         theme('username', array('account' => $dblog)),
+        $dblog->server_addr . ' (' . $dblog->server_name. ')',
         $dblog->link,
       ),
       // Attributes for tr
@@ -172,6 +174,14 @@
         array('data' => t('Operations'), 'header' => TRUE),
         $dblog->link,
       ),
+      array(
+        array('data' => t('Server IP'), 'header' => TRUE),
+        $dblog->server_addr,
+      ),
+      array(
+        array('data' => t('Server Name'), 'header' => TRUE),
+        $dblog->server_name,
+      ),
     );
     $build['dblog_table'] = array(
       '#theme' => 'table',
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.46
diff -u -r1.46 dblog.module
--- modules/dblog/dblog.module	6 Dec 2009 18:11:41 -0000	1.46
+++ modules/dblog/dblog.module	30 Dec 2009 20:35:20 -0000
@@ -28,7 +28,7 @@
       $output .= '<dt>' . t('Debugging site problems') . '</dt>';
       $output .= '<dd>' . t('In case of errors or problems with the site, the <a href="@dblog">Recent log entries</a> page can be useful for debugging, since it shows the sequence of events. The log entries include usage information, warnings, and errors.', array('@dblog' => url('admin/reports/dblog'))) . '</dd>';
       $output .= '</dl>';
-      return $output;	
+      return $output;
     case 'admin/reports/dblog':
       return '<p>' . t('The Database logging module monitors your website, capturing system events in a log (shown here) to be reviewed by an authorized individual at a later time. This log is a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the Recent log entries report on a regular basis, as it is often the only way to tell what is going on.') . '</p>';
   }
@@ -157,6 +157,8 @@
       'referer' => $log_entry['referer'],
       'hostname' => substr($log_entry['ip'], 0, 128),
       'timestamp' => $log_entry['timestamp'],
+      'server_addr' => $log_entry['server_addr'],
+      'server_name' => $log_entry['server_name'],
     ))
     ->execute();
 }
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.338
diff -u -r1.338 bootstrap.inc
--- includes/bootstrap.inc	30 Dec 2009 08:16:55 -0000	1.338
+++ includes/bootstrap.inc	30 Dec 2009 20:35:19 -0000
@@ -1317,6 +1317,8 @@
       'referer'     => $_SERVER['HTTP_REFERER'],
       'ip'          => ip_address(),
       'timestamp'   => REQUEST_TIME,
+      'server_addr' => $_SERVER['SERVER_ADDR'],
+      'server_name' => $_SERVER['SERVER_NAME'],
     );
 
     // Call the logging hooks to log/process the message
Index: modules/simpletest/tests/actions_loop_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions_loop_test.module,v
retrieving revision 1.3
diff -u -r1.3 actions_loop_test.module
--- modules/simpletest/tests/actions_loop_test.module	4 Dec 2009 16:49:47 -0000	1.3
+++ modules/simpletest/tests/actions_loop_test.module	30 Dec 2009 20:35:20 -0000
@@ -86,6 +86,8 @@
     'referer'     => $_SERVER['HTTP_REFERER'],
     'ip'          => ip_address(),
     'timestamp'   => REQUEST_TIME,
+    'server_addr' => $_SERVER['SERVER_ADDR'],
+    'server_name' => $_SERVER['SERVER_NAME'],
   );
 
   // Call the logging hooks to log/process the message
Index: modules/syslog/syslog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v
retrieving revision 1.31
diff -u -r1.31 syslog.module
--- modules/syslog/syslog.module	4 Dec 2009 16:49:47 -0000	1.31
+++ modules/syslog/syslog.module	30 Dec 2009 20:35:20 -0000
@@ -101,6 +101,8 @@
   global $base_url;
 
   $message  = $base_url;
+  $message .= '|' . $entry['server_addr'];
+  $message .= '|' . $entry['server_name'];
   $message .= '|' . $entry['timestamp'];
   $message .= '|' . $entry['type'];
   $message .= '|' . $entry['ip'];
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.113
diff -u -r1.113 system.api.php
--- modules/system/system.api.php	29 Dec 2009 20:23:10 -0000	1.113
+++ modules/system/system.api.php	30 Dec 2009 20:35:21 -0000
@@ -1267,6 +1267,7 @@
   ));
 
   $params['message']  = "\nSite:         @base_url";
+  $params['message']  = "\nServer:       @server_addr (@server_name)";
   $params['message'] .= "\nSeverity:     (@severity) @severity_desc";
   $params['message'] .= "\nTimestamp:    @timestamp";
   $params['message'] .= "\nType:         @type";
@@ -1279,6 +1280,8 @@
 
   $params['message'] = t($params['message'], array(
     '@base_url'      => $base_url,
+    '@severity'      => $log_entry['server_addr'],
+    '@severity'      => $log_entry['server_name'],
     '@severity'      => $log_entry['severity'],
     '@severity_desc' => $severity_list[$log_entry['severity']],
     '@timestamp'     => format_date($log_entry['timestamp']),