diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Minz/Log.php | 23 | ||||
| -rw-r--r-- | lib/favicons.php | 1 | ||||
| -rw-r--r-- | lib/lib_rss.php | 13 |
3 files changed, 19 insertions, 18 deletions
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php index 3e6a25f27..3a45082f7 100644 --- a/lib/Minz/Log.php +++ b/lib/Minz/Log.php @@ -20,21 +20,24 @@ class Minz_Log { * @throws Minz_PermissionDeniedException */ public static function record ($information, $level, $file_name = null) { - try { - $conf = Minz_Configuration::get('system'); - $env = $conf->environment; - } catch (Minz_ConfigurationException $e) { - $env = 'production'; + $env = getenv('FRESHRSS_ENV'); + if ($env == '') { + try { + $conf = Minz_Configuration::get('system'); + $env = $conf->environment; + } catch (Minz_ConfigurationException $e) { + $env = 'production'; + } } if (! ($env === 'silent' || ($env === 'production' && ($level >= LOG_NOTICE)))) { + $username = Minz_Session::param('currentUser', ''); + if ($username == '') { + $username = '_'; + } if ($file_name === null) { - $username = Minz_Session::param('currentUser', ''); - if ($username == '') { - $username = '_'; - } $file_name = join_path(USERS_PATH, $username, 'log.txt'); } @@ -60,7 +63,7 @@ class Minz_Log { . ' --- ' . $information . "\n"; if (defined('COPY_LOG_TO_SYSLOG') && COPY_LOG_TO_SYSLOG) { - syslog($level, '[' . $username . '] ' . $log); + syslog($level, '[' . $username . '] ' . trim($log)); } self::ensureMaxLogSize($file_name); diff --git a/lib/favicons.php b/lib/favicons.php index bc82b57b9..6cb3d373e 100644 --- a/lib/favicons.php +++ b/lib/favicons.php @@ -22,7 +22,6 @@ function isImgMime($content) { } function downloadHttp(&$url, $curlOptions = array()) { - prepareSyslog(); syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $url); if (substr($url, 0, 2) === '//') { $url = 'https:' . $url; diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 357c02e82..1060ef5c5 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -9,6 +9,12 @@ if (!function_exists('mb_strcut')) { } } +if (COPY_SYSLOG_TO_STDERR) { + openlog('FreshRSS', LOG_CONS | LOG_ODELAY | LOG_PID | LOG_PERROR, LOG_USER); +} else { + openlog('FreshRSS', LOG_CONS | LOG_ODELAY | LOG_PID, LOG_USER); +} + /** * Build a directory path by concatenating a list of directory names. * @@ -188,19 +194,12 @@ function html_only_entity_decode($text) { return strtr($text, $htmlEntitiesOnly); } -function prepareSyslog() { - return COPY_SYSLOG_TO_STDERR ? openlog("FreshRSS", LOG_PERROR | LOG_PID, LOG_USER) : false; -} - function customSimplePie($attributes = array()) { $system_conf = Minz_Configuration::get('system'); $limits = $system_conf->limits; $simplePie = new SimplePie(); $simplePie->set_useragent(FRESHRSS_USERAGENT); $simplePie->set_syslog($system_conf->simplepie_syslog_enabled); - if ($system_conf->simplepie_syslog_enabled) { - prepareSyslog(); - } $simplePie->set_cache_location(CACHE_PATH); $simplePie->set_cache_duration($limits['cache_duration']); |