summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-08-23 10:23:20 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-08-23 10:23:20 +0000
commitba56d3d7d070cc82bad9ddd3375d1447452f5317 (patch)
tree0f590c93a6fdca8cafb38bd1dc0416b2d78eed74 /roundcubemail/program
parentf665ad1c85275fdbec5e463d7bf1e117e46708f2 (diff)
- Don't add date to log when using syslog
git-svn-id: https://svn.roundcube.net/trunk@3901 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/main.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index ff535947d..f9ce5476e 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1117,14 +1117,14 @@ function write_log($name, $line)
return true;
}
- $log_entry = sprintf("[%s]: %s\n", $date, $line);
-
if ($CONFIG['log_driver'] == 'syslog') {
$prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
- syslog($prio, $log_entry);
+ syslog($prio, $line);
return true;
}
else {
+ $line = sprintf("[%s]: %s\n", $date, $line);
+
// log_driver == 'file' is assumed here
if (empty($CONFIG['log_dir']))
$CONFIG['log_dir'] = INSTALL_PATH.'logs';
@@ -1132,7 +1132,7 @@ function write_log($name, $line)
// try to open specific log file for writing
$logfile = $CONFIG['log_dir'].'/'.$name;
if ($fp = @fopen($logfile, 'a')) {
- fwrite($fp, $log_entry);
+ fwrite($fp, $line);
fflush($fp);
fclose($fp);
return true;