From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 24 Jul 2016 05:30:59 -0400
Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders
---
server/cron.php | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/server/cron.php b/server/cron.php
index ce7a26f..58d48ec 100644
--- a/server/cron.php
+++ b/server/cron.php
@@ -29,8 +29,28 @@
*/
define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
-require(SCRIPT_PATH."/lib/config.inc.php");
-require(SCRIPT_PATH."/lib/app.inc.php");
+require SCRIPT_PATH."/lib/config.inc.php";
+
+// Check whether another instance of this script is already running
+if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock')) {
+ clearstatcache();
+ $pid = trim(file_get_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock'));
+ if(preg_match('/^[0-9]+$/', $pid)) {
+ if(file_exists('/proc/' . $pid)) {
+ print @date('d.m.Y-H:i').' - WARNING - There is already an instance of server.php running with pid ' . $pid . '.' . "\n";
+ exit;
+ }
+ }
+ print @date('d.m.Y-H:i').' - WARNING - There is already a lockfile set, but no process running with this pid (' . $pid . '). Continuing.' . "\n";
+}
+
+// Set Lockfile
+@file_put_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock', getmypid());
+
+if($conf['log_priority'] <= LOGLEVEL_DEBUG) print 'Set Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock' . "\n";
+
+
+require SCRIPT_PATH."/lib/app.inc.php";
set_time_limit(0);
ini_set('error_reporting', E_ALL & ~E_NOTICE);
@@ -50,41 +70,45 @@
$files = array();
$d = opendir($path);
while($f = readdir($d)) {
- $file_path = $path . '/' . $f;
- if($f === '.' || $f === '..' || !is_file($file_path)) continue;
- if(substr($f, strrpos($f, '.')) !== '.php') continue;
- $files[] = $f;
+ $file_path = $path . '/' . $f;
+ if($f === '.' || $f === '..' || !is_file($file_path)) continue;
+ if(substr($f, strrpos($f, '.')) !== '.php') continue;
+ $files[] = $f;
}
closedir($d);
// sort in alphabetical order, so we can use prefixes like 000-xxx
sort($files);
-
+
foreach($files as $f) {
- $name = substr($f, 0, strpos($f, '.'));
- if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numerical prefix from file name
-
- include($path . '/' . $f);
- $class_name = 'cronjob_' . $name;
-
- if(class_exists($class_name, false)) {
- $cronjob = new $class_name();
- if(get_parent_class($cronjob) !== 'cronjob') {
- print 'Invalid class ' . $class_name . ' not extending class cronjob (' . get_parent_class($cronjob) . ')!' . "\n";
- unset($cronjob);
- continue;
- }
- print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n";
-
- $cronjob->run();
-
- print 'run job (' . $class_name . ') done.' . "\n";
-
- unset($cronjob);
- }
+ $name = substr($f, 0, strpos($f, '.'));
+ if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numerical prefix from file name
+
+ include $path . '/' . $f;
+ $class_name = 'cronjob_' . $name;
+
+ if(class_exists($class_name, false)) {
+ $cronjob = new $class_name();
+ if(get_parent_class($cronjob) !== 'cronjob') {
+ print 'Invalid class ' . $class_name . ' not extending class cronjob (' . get_parent_class($cronjob) . ')!' . "\n";
+ unset($cronjob);
+ continue;
+ }
+ print 'Included ' . $class_name . ' from ' . $path . '/' . $f . ' -> will now run job.' . "\n";
+
+ $cronjob->run();
+
+ print 'run job (' . $class_name . ') done.' . "\n";
+
+ unset($cronjob);
+ }
}
unset($files);
+// Remove lock
+@unlink($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock');
+$app->log('Remove Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock', LOGLEVEL_DEBUG);
+
die("finished.\n");
?>
--
Gitblit v1.9.1