add the logfile entry to common, a little recoding in common_log

darcs-hash:20080712151521-84dde-a81c53bacbe15e77b70fc460ad9143e7e4f8402c.gz
This commit is contained in:
Evan Prodromou 2008-07-12 11:15:21 -04:00
parent 74c3b9de23
commit a25f5010e6
2 changed files with 14 additions and 9 deletions

View File

@ -40,6 +40,7 @@ $config =
'server' => 'localhost',
'theme' => 'default',
'path' => '/',
'logfile' => NULL,
'fancy' => false,
'email' => $_SERVER['SERVER_ADMIN'],
'broughtby' => NULL,

View File

@ -1063,15 +1063,19 @@ function common_ensure_syslog() {
}
function common_log($priority, $msg, $filename=NULL) {
common_ensure_syslog();
syslog($priority, $msg);
global $config;
$log = fopen($config['site']['logfile'], "a");
if ($log) {
$syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', 'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG');
$output = date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
fwrite($log, $output);
fclose($log);
$logfile = common_config('site', 'logfile');
if ($logfile) {
$log = fopen($logfile, "a");
if ($log) {
static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR',
'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG');
$output = date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
fwrite($log, $output);
fclose($log);
}
} else {
common_ensure_syslog();
syslog($priority, $msg);
}
}