Merge branch 'issue-logfilename' of https://github.com/remicollet/roundcubemail into remicollet-issue-logfilename

pull/5838/head
Aleksander Machniak 8 years ago
commit 8b7c7dd5a9

@ -77,6 +77,9 @@ $config['log_date_format'] = 'd-M-Y H:i:s O';
// set to 0 to avoid session IDs being logged. // set to 0 to avoid session IDs being logged.
$config['log_session_id'] = 8; $config['log_session_id'] = 8;
// Default extension used for log file name
$config['log_file_ext'] = '.log';
// Syslog ident string to use, if using the 'syslog' log driver. // Syslog ident string to use, if using the 'syslog' log driver.
$config['syslog_id'] = 'roundcube'; $config['syslog_id'] = 'roundcube';

@ -1250,11 +1250,17 @@ class rcube
} }
} }
if (self::$instance) {
$log_suf = self::$instance->config->get('log_file_ext', '.log');
} else {
$log_suf = '.log';
}
if (empty($log_dir)) { if (empty($log_dir)) {
$log_dir = RCUBE_INSTALL_PATH . 'logs'; $log_dir = RCUBE_INSTALL_PATH . 'logs';
} }
return file_put_contents("$log_dir/$name", $line, FILE_APPEND) !== false; return file_put_contents("$log_dir/$name$log_suf", $line, FILE_APPEND) !== false;
} }
/** /**

Loading…
Cancel
Save