mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 08:14:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove calls to syslog()

Browse Source 
Temporary fix:

- Change syslog by Minz_Log::notice in most of the files
- Logs are stored in USERS_PATH/_/log.txt for actualize_script.php
- Simply comment syslog in SimplePie

See https://github.com/FreshRSS/FreshRSS/issues/711
This commit is contained in:
Marien Fressinaud
2015-01-29 10:14:45 +01:00
parent b355a45c35
commit 59ea9f2a3b
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Feed.php
View File

@@ -249,10 +249,10 @@ class FreshRSS_Feed extends Minz_Model {
}
if (($mtime === true) ||($mtime > $this->lastUpdate)) {
syslog(LOG_DEBUG, 'FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
$this->loadEntries($feed); // et on charge les articles du flux
} else {
syslog(LOG_DEBUG, 'FreshRSS use cache for ' . $subscribe_url);
Minz_Log::notice('FreshRSS use cache for ' . $subscribe_url);
$this->entries = array();
}

12
app/actualize_script.php
View File

@@ -21,6 +21,9 @@ $_GET['force'] = true;
$_SERVER['HTTP_HOST'] = '';
$log_file = join_path(USERS_PATH, '_', 'log.txt');
$app = new FreshRSS();
$system_conf = Minz_Configuration::get('system');
@@ -41,13 +44,13 @@ $min_last_activity = time() - $limits['max_inactivity'];
foreach ($users as $user) {
if (($user !== $system_conf->default_user) &&
(FreshRSS_UserDAO::mtime($user) < $min_last_activity)) {
syslog(LOG_INFO, 'FreshRSS skip inactive user ' . $user);
Minz_Log::notice('FreshRSS skip inactive user ' . $user, $log_file);
if (defined('STDOUT')) {
fwrite(STDOUT, 'FreshRSS skip inactive user ' . $user . "\n"); //Unbuffered
}
continue;
}
syslog(LOG_INFO, 'FreshRSS actualize ' . $user);
Minz_Log::notice('FreshRSS actualize ' . $user, $log_file);
if (defined('STDOUT')) {
fwrite(STDOUT, 'Actualize ' . $user . "...\n"); //Unbuffered
}
@@ -62,7 +65,8 @@ foreach ($users as $user) {
if (!invalidateHttpCache()) {
syslog(LOG_NOTICE, 'FreshRSS write access problem in ' . join_path(USERS_PATH, $user, 'log.txt'));
Minz_Log::notice('FreshRSS write access problem in ' . join_path(USERS_PATH, $user, 'log.txt'),
$log_file);
if (defined('STDERR')) {
fwrite(STDERR, 'Write access problem in ' . join_path(USERS_PATH, $user, 'log.txt') . "\n");
}
@@ -70,7 +74,7 @@ foreach ($users as $user) {
}
syslog(LOG_INFO, 'FreshRSS actualize done.');
Minz_Log::notice('FreshRSS actualize done.', $log_file);
if (defined('STDOUT')) {
fwrite(STDOUT, 'Done.' . "\n");
$end_date = date_create('now');

4
lib/SimplePie/SimplePie.php
View File

@@ -1529,11 +1529,11 @@ class SimplePie
{ //FreshRSS
$md5 = $this->cleanMd5($file->body);
if ($this->data['md5'] === $md5) {
syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
// syslog(LOG_DEBUG, 'SimplePie MD5 cache match for ' . $this->feed_url);
$cache->touch();
return true; //Content unchanged even though server did not send a 304
} else {
syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . $this->feed_url);
// syslog(LOG_DEBUG, 'SimplePie MD5 cache no match for ' . $this->feed_url);
$this->data['md5'] = $md5;
}
}

2
lib/SimplePie/SimplePie/File.php
View File

@@ -79,7 +79,7 @@ class SimplePie_File
$this->useragent = $useragent;
if (preg_match('/^http(s)?:\/\//i', $url))
{
syslog(LOG_INFO, 'SimplePie GET ' . $url); //FreshRSS
// syslog(LOG_INFO, 'SimplePie GET ' . $url); //FreshRSS
if ($useragent === null)
{
$useragent = ini_get('user_agent');

2
lib/lib_rss.php
View File

@@ -180,7 +180,7 @@ function sanitizeHTML($data, $base = '') {
function get_content_by_parsing ($url, $path) {
require_once (LIB_PATH . '/lib_phpQuery.php');
syslog(LOG_INFO, 'FreshRSS GET ' . $url);
Minz_Log::notice('FreshRSS GET ' . $url);
$html = file_get_contents ($url);
if ($html) {