From 2191eb7aab7686df01bee88ed18068897ce2912f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 21 Mar 2013 14:56:04 +0400 Subject: [PATCH] update.php: add support for output logging --- include/functions.php | 18 ++++++++++++++---- update.php | 8 +++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/functions.php b/include/functions.php index ac42a5d77..f259a7189 100644 --- a/include/functions.php +++ b/include/functions.php @@ -122,14 +122,24 @@ * @return void */ function _debug($msg) { - if (defined('QUIET') && QUIET) { - return; - } $ts = strftime("%H:%M:%S", time()); if (function_exists('posix_getpid')) { $ts = "$ts/" . posix_getpid(); } - print "[$ts] $msg\n"; + + if (!(defined('QUIET') && QUIET)) { + print "[$ts] $msg\n"; + } + + if (defined('LOGFILE')) { + $fp = fopen(LOGFILE, 'a+'); + + if ($fp) { + fputs($fp, "[$ts] $msg\n"); + fclose($fp); + } + } + } // function _debug /** diff --git a/update.php b/update.php index a92b125e4..9862e1ff2 100755 --- a/update.php +++ b/update.php @@ -29,6 +29,7 @@ "task:", "cleanup-tags", "quiet", + "log:", "indexes", "convert-filters", "force-update", @@ -60,7 +61,6 @@ exit; } - if (count($options) == 0 || isset($options["help"]) ) { print "Tiny Tiny RSS data update script.\n\n"; print "Options:\n"; @@ -70,6 +70,7 @@ print " --task N - create lockfile using this task id\n"; print " --cleanup-tags - perform tags table maintenance\n"; print " --quiet - don't show messages\n"; + print " --log FILE - log messages to FILE\n"; print " --indexes - recreate missing schema indexes\n"; print " --convert-filters - convert type1 filters to type2\n"; print " --force-update - force update of all feeds\n"; @@ -84,6 +85,11 @@ return; } + if (isset($options["log"])) { + _debug("Logging to " . $options["log"]); + define('LOGFILE', $options["log"]); + } + define('QUIET', isset($options['quiet'])); if (!isset($options["daemon"])) {