refs #4780 added possibility to enable tracker debug via config, use logger for printing debug messages which allows users to log to screen, file or db

3 files changed, 18 insertions, 9 deletions

diff --git a/core/Common.php b/core/Common.php
index b25047f078..ec31f88280 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -31,7 +31,6 @@ class Common
 
     public static $isCliMode = null;
 
-
     /*
      * Database
      */
@@ -1062,17 +1061,19 @@ class Common
     static public function printDebug($info = '')
     {
         if (isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) {
-            if(is_object($info)) {
+
+            if (is_object($info)) {
                 $info = var_export($info, true);
             }
+
+            Log::getInstance()->setLogLevel(Log::DEBUG);
+
             if (is_array($info)) {
-                print("<pre>");
                 $info = Common::sanitizeInputValues($info);
                 $out = var_export($info, true);
-                echo $out;
-                print("</pre>");
+                Log::debug($out);
             } else {
-                print(htmlspecialchars($info, ENT_QUOTES) . "<br />\n");
+                Log::debug(htmlspecialchars($info, ENT_QUOTES));
             }
         }
     }
diff --git a/core/Log.php b/core/Log.php
index b6f8230735..76e59709df 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -290,7 +290,7 @@ class Log extends Singleton
             if ($logLevel >= self::NONE // sanity check
                 && $logLevel <= self::VERBOSE
             ) {
-                $this->currentLogLevel = $logLevel;
+                $this->setLogLevel($logLevel);
             }
         }
     }
@@ -355,6 +355,11 @@ class Log extends Singleton
         return $writers;
     }
 
+    public function setLogLevel($logLevel)
+    {
+        $this->currentLogLevel = $logLevel;
+    }
+
     private function logToFile($level, $tag, $datetime, $message)
     {
         if (is_string($message)) {
diff --git a/core/Tracker.php b/core/Tracker.php
index 463b3a3a9a..c67d2e91f1 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -350,7 +350,10 @@ class Tracker
             // restore original user privilege
             Piwik::setUserHasSuperUserAccess($isSuperUser);
 
-            Common::printDebug($resultTasks);
+            foreach (explode('</pre>', $resultTasks) as $resultTask) {
+                Common::printDebug(str_replace('<pre>', '', $resultTask));
+            }
+
             Common::printDebug('Finished Scheduled Tasks.');
         } else {
             Common::printDebug("-> Scheduled tasks not triggered.");
@@ -851,7 +854,7 @@ class Tracker
                 Common::printDebug("The request is invalid: empty request, or maybe tracking is disabled in the config.ini.php via record_statistics=0");
             }
         } catch (DbException $e) {
-            Common::printDebug("<b>" . $e->getMessage() . "</b>");
+            Common::printDebug("Exception: " . $e->getMessage());
             $this->exitWithException($e, $isAuthenticated);
         } catch (Exception $e) {
             $this->exitWithException($e, $isAuthenticated);