valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace suppress debugging kludge with a more flexible function (fixes 

logging with update.php --feeds being stopped after first feed)
This commit is contained in:
Andrew Dolgov 2013-09-15 22:57:50 +04:00
parent 811a81c6de
commit 4f71d7431c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/functions.php
View File

@ -11,6 +11,7 @@
$fetch_last_error_code = false; $fetch_last_error_code = false;
$fetch_last_content_type = false; $fetch_last_content_type = false;
$fetch_curl_used = false; $fetch_curl_used = false;
$suppress_debugging = false;
mb_internal_encoding("UTF-8"); mb_internal_encoding("UTF-8");
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
@ -132,6 +133,12 @@
$schema_version = false; $schema_version = false;
function _debug_suppress($suppress) {
global $suppress_debugging;
$suppress_debugging = $suppress;
}
/** /**
* Print a timestamped debug message. * Print a timestamped debug message.
* *
@ -139,8 +146,11 @@
* @return void * @return void
*/ */
function _debug($msg, $show = true) { function _debug($msg, $show = true) {
if (defined('SUPPRESS_DEBUGGING')) global $suppress_debugging;
return false;
//echo "[$suppress_debugging] $msg $show\n";
if ($suppress_debugging) return false;
$ts = strftime("%H:%M:%S", time()); $ts = strftime("%H:%M:%S", time());
if (function_exists('posix_getpid')) { if (function_exists('posix_getpid')) {

4
include/rssfuncs.php
View File

@ -175,6 +175,7 @@
while ($tline = db_fetch_assoc($tmp_result)) { while ($tline = db_fetch_assoc($tmp_result)) {
if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]); if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
update_rss_feed($tline["id"], true); update_rss_feed($tline["id"], true);
_debug_suppress(false);
++$nf; ++$nf;
} }
} }
@ -194,8 +195,7 @@
$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']; $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
if (!$debug_enabled) define('SUPPRESS_DEBUGGING', true); _debug_suppress(!$debug_enabled);
_debug("start", $debug_enabled); _debug("start", $debug_enabled);
$result = db_query("SELECT id,update_interval,auth_login, $result = db_query("SELECT id,update_interval,auth_login,