Ticket #1484850: syslog.diff

installer/config.php

@@ -99 +99 @@
 <div>Use this folder to store temp files (must be writebale for webserver)</div>
 </dd>
 
+<dt class="propname">log_driver</dt>
+<dd>
+<?php
+
+$select_log_driver = new select(array('name' => '_log_driver', 'id' => "cfglogdriver"));
+$select_log_driver->add(array('file', 'syslog'), array('file', 'syslog'));
+echo $select_log_driver->show($RCI->getprop('log_driver'));
+
+?>
+<div>How to do logging?  'file':  Write to files in the log directory.  'syslog': Use the syslog facility.</div>
+</dd>
+
 <dt class="propname">log_dir</dt>
 <dd>
 <?php
@@ -107 +119 @@
 echo $input_logdir->show($RCI->getprop('log_dir'));
 
 ?>
-<div>Use this folder to store log files (must be writebale for webserver)</div>
+<div>Use this folder to store log files (must be writebale for webserver).  Note that this only applies if you are using the 'file' log_driver.</div>
 </dd>
 
+<dt class="propname">syslog_id</dt>
+<dd>
+<?php
+
+$input_syslogid = new textfield(array('name' => '_syslog_id', 'size' => 30, 'id' => "cfgsyslogid"));
+echo $input_syslogid->show($RCI->getprop('syslog_id'));
+
+?>
+<div>What ID to use when logging with syslog.  Note that this only applies if you are using the 'syslog' log_driver.</div>
+</dd>
+
 <dt class="propname">ip_check</dt>
 <dd>
 <?php

config/main.inc.php.dist

@@ -18 +18 @@
 // system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
 $rcmail_config['debug_level'] = 1;
 
+// log driver:  'syslog' or 'file'.
+$rcmail_config['log_driver'] = 'file';
+
+// use this folder to store log files (must be writebale for apache user)
+// This is used by the 'file' log driver.
+$rcmail_config['log_dir'] = 'logs/';
+
+// Syslog id to use, if using the 'syslog' log driver.
+$rcmail_config['syslog_id'] = 'roundcube';
+
 // enable caching of messages and mailbox data in the local database.
 // this is recommended if the IMAP server does not run on the same machine
 $rcmail_config['enable_caching'] = TRUE;
@@ -99 +109 @@
 // use this folder to store temp files (must be writebale for apache user)
 $rcmail_config['temp_dir'] = 'temp/';
 
-// use this folder to store log files (must be writebale for apache user)
-$rcmail_config['log_dir'] = 'logs/';
-
 // session lifetime in minutes
 $rcmail_config['session_lifetime'] = 10;
 

program/include/bugs.inc

@@ -84 +84 @@
       $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
       
     // try to open specific log file for writing
-    if ($fp = @fopen($CONFIG['log_dir'].'/errors', 'a'))
+    if ($CONFIG['log_driver'] == 'syslog')
     {
+      syslog(LOG_ERR, $log_entry);
+    }
+    else if ($fp = @fopen($CONFIG['log_dir'].'/errors', 'a'))
+    {
+      // log_driver == 'file' is the default, assumed here.
       fwrite($fp, $log_entry);
       fclose($fp);
     }

program/include/main.inc

@@ -151 +151 @@
   else
     $conf['log_dir'] = unslashify($conf['log_dir']);
 
+  if ($conf['log_driver'] == 'syslog')
+    openlog($conf['syslog_id'], 0, LOG_USER);
+
   // set PHP error logging according to config
-  if ($conf['debug_level'] & 1)
-    {
+  if ($conf['debug_level'] & 1) {
     ini_set('log_errors', 1);
-    ini_set('error_log', $conf['log_dir'].'/errors');
-    }
+    if ($conf['log_driver'] == 'syslog') {
+      ini_set('error_log', 'syslog');
+    } else { // log_driver == 'file' is assumed here.
+      ini_set('error_log', $conf['log_dir'].'/errors');
+        }
+  }
   if ($conf['debug_level'] & 4)
     ini_set('display_errors', 1);
   else
@@ -1602 +1608 @@
  * @param $name Name of logfile
  * @param $line Line to append
  */
-function write_log($name, $line)
-  {
+function write_log($name, $line) {
   global $CONFIG, $INSTALL_PATH;
 
   if (!is_string($line))
@@ -1616 +1621 @@
   if (empty($CONFIG['log_dir']))
     $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
       
-  // try to open specific log file for writing
-  if ($fp = @fopen($CONFIG['log_dir'].'/'.$name, 'a'))    
-    {
-    fwrite($fp, $log_entry);
-    fclose($fp);
+  if ($CONFIG['log_driver'] == 'syslog') {
+    if ($name == 'errors')
+      $priority = LOG_ERR;
+    else
+      $priority = LOG_INFO;
+
+    syslog($priority, $log_entry);
+  } else { // log_driver == 'file' is assumed here
+    // try to open specific log file for writing
+    if ($fp = @fopen($CONFIG['log_dir'].'/'.$name, 'a')) {
+      fwrite($fp, $log_entry);
+      fclose($fp);
     }
   }
+}
 
 
 /**

program/steps/mail/sendmail.inc

@@ -402 +402 @@
       $mailto,
       !empty($smtp_response) ? join('; ', $smtp_response) : '');
 
-    if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a'))
+    if ($CONFIG['log_driver'] == 'syslog') 
+      syslog(LOG_INFO, $log_entry);
+    else if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a')) 
       {
+      // log_driver == 'file' is assumed here.
       fwrite($fp, $log_entry);
       fclose($fp);
       }