From 03ed8666876866851cb662e52b19903ef1da13ad Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 4 Mar 2020 17:13:04 +0100
Subject: [PATCH] Revert earlier, just default log_target to empty string, cron
discards the output anyway.
---
server/plugins-available/cron_plugin.inc.php | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 4c1e07c65f..dac261832f 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -224,7 +224,7 @@ class cron_plugin {
$command = str_replace(" ", "", $job['run_min']) . "\t" . str_replace(" ", "", $job['run_hour']) . "\t" . str_replace(" ", "", $job['run_mday']) . "\t" . str_replace(" ", "", $job['run_month']) . "\t" . str_replace(" ", "", $job['run_wday']);
}
- $log_target = ">/dev/null 2>&1";
+ $log_target = "";
$log_wget_target = '/dev/null';
$log_root = '';
if($job['log'] == 'y') {
@@ -259,13 +259,7 @@ class cron_plugin {
$command .= "\t";
//if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
-
- $command .= $job['command'];
-
- // Add a default log target when no redirection is included in the command.
- if (!preg_match('/>/', $job['command'])) {
- $command .= " " . $log_target;
- }
+ $command .= $job['command'] . " " . $log_target;
}
if($job['type'] == 'chrooted') {
--
GitLab