From 687ad252d2e80ba05ec9db768ae7b2252299ccf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 09 Dec 2010 08:20:52 -0500
Subject: [PATCH] Added fixes for: FS#1421 - Updates trough sys_remoteaction do not seem to work reliably, needs testing
---
server/mods-available/remoteaction_core_module.inc.php | 6 +++++-
install/autoupdate.php | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index 1629d6a..7a57985 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -281,7 +281,7 @@
//** Restart services:
swriteln('Restarting services ...');
-if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
if($conf['services']['mail']) {
if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index a613b83..7db78aa 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -144,6 +144,10 @@
}
private function _doIspCUpdate($action) {
+
+ // Ensure that this code is not executed twice as this would cause a loop in case of a failure
+ $this->_actionDone($action['action_id'], 'ok');
+
/*
* Get the version-number of the newest version
*/
@@ -189,7 +193,7 @@
/*
* All well done!
*/
- $this->_actionDone($action['action_id'], 'ok');
+ //$this->_actionDone($action['action_id'], 'ok');
}
}
?>
\ No newline at end of file
--
Gitblit v1.9.1