From 3faab0ca9e097627420aec19c01ad8336fe79c22 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 25 Feb 2014 03:01:22 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
server/plugins-available/cron_plugin.inc.php | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 32e1a0b..d02b1fd 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -203,16 +203,19 @@
}
$log_target = ">/dev/null 2>&1";
+ $log_wget_target = '/dev/null';
+ $log_root = '';
if($job['log'] == 'y') {
- $log_root = '';
- if($job['type'] != 'chrooted') $log_root = $this->parent_domain['document_root'] . '/log';
+ if($job['type'] != 'chrooted') $log_root = $this->parent_domain['document_root'];
+ $log_root .= '/log';
- $log_target = '>' . $log_root . '/cron.log 2>' . $log_root . '/cron_error.log';
+ $log_target = '>>' . $log_root . '/cron.log 2>>' . $log_root . '/cron_error.log';
+ $log_wget_target = $log_root . '/cron_wget.log';
}
$command .= "\t{$this->parent_domain['system_user']}"; //* running as user
if($job['type'] == 'url') {
- $command .= "\t{$cron_config['wget']} -q -t 1 -T 7200 -O /dev/null " . escapeshellarg($job['command']) . " " . $log_target;
+ $command .= "\t{$cron_config['wget']} -q -t 1 -T 7200 -O " . $log_wget_target . " " . escapeshellarg($job['command']) . " " . $log_target;
} else {
$web_root = '';
if($job['type'] == 'chrooted') {
@@ -223,8 +226,6 @@
} else {
$web_root = $this->parent_domain['document_root'];
}
-
- $log_root = $web_root . '/';
$web_root .= '/web';
$job['command'] = str_replace('[web_root]', $web_root, $job['command']);
--
Gitblit v1.9.1