Merge branch 'MDL-66570-master' of git://github.com/andrewnicols/moodle

safatshahin · Sep 26, 2019 · c2c1cbd · c2c1cbd
2 parents 57054fc + e044c3d
commit c2c1cbd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/admin/settings/server.php b/admin/settings/server.php
@@ -271,6 +271,14 @@
         ]
     )
 );
+$temp->add(
+    new admin_setting_configcheckbox(
+        'task_logtostdout',
+        new lang_string('task_logtostdout', 'admin'),
+        new lang_string('task_logtostdout_desc', 'admin'),
+        1
+    )
+);
 
 if (\core\task\logmanager::uses_standard_settings()) {
     $temp->add(

diff --git a/lang/en/admin.php b/lang/en/admin.php
@@ -1213,6 +1213,8 @@
 $string['task_logretention_desc'] = 'The maximum period that logs should be kept for. This setting interacts with the \'Retain runs\' setting: whichever is reached first will apply';
 $string['task_logretainruns'] = 'Retain runs';
 $string['task_logretainruns_desc'] = 'The number of runs of each task to retain. This setting interacts with the \'Retention period\' setting: whichever is reached first will apply.';
+$string['task_logtostdout'] = 'Display log output';
+$string['task_logtostdout_desc'] = 'When jobs are running and the output is captured, whether the captured output should also be displayed as the task runs.';
 $string['task_type:adhoc'] = 'Ad hoc';
 $string['task_type:scheduled'] = 'Scheduled';
 $string['task_result:failed'] = 'Fail';

diff --git a/lib/classes/task/logmanager.php b/lib/classes/task/logmanager.php
@@ -76,13 +76,18 @@ class logmanager {
      */
     protected static $oblevel = null;
 
+    /**
+     * @var bool Output logged content to screen.
+     */
+    protected static $outputloggedcontent = true;
+
     /**
      * Create a new task logger for the specified task, and prepare for logging.
      *
      * @param   \core\task\task_base    $task The task being run
      */
     public static function start_logging(task_base $task) {
-        global $DB;
+        global $CFG, $DB;
 
         if (!self::should_log()) {
             return;
@@ -129,6 +134,8 @@ public static function start_logging(task_base $task) {
             self::$oblevel = null;
         }
 
+        self::$outputloggedcontent = !empty($CFG->task_logtostdout);
+
         // Start capturing output.
         ob_start([\core\task\logmanager::class, 'add_line'], self::CHUNKSIZE);
     }
@@ -336,6 +343,10 @@ public static function add_line(string $log) : string {
             fwrite(self::$fh, $log);
         }
 
-        return $log;
+        if (self::$outputloggedcontent) {
+            return $log;
+        } else {
+            return '';
+        }
     }
 }
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -9090,11 +9090,11 @@ function mtrace($string, $eol="\n", $sleep=0) {
         $fn($string, $eol);
         return;
     } else if (defined('STDOUT') && !PHPUNIT_TEST && !defined('BEHAT_TEST')) {
-        fwrite(STDOUT, $string.$eol);
-
         // We must explicitly call the add_line function here.
         // Uses of fwrite to STDOUT are not picked up by ob_start.
-        \core\task\logmanager::add_line("{$string}{$eol}");
+        if ($output = \core\task\logmanager::add_line("{$string}{$eol}")) {
+            fwrite(STDOUT, $output);
+        }
     } else {
         echo $string . $eol;
     }

diff --git a/version.php b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2019092000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2019092000.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.