From 039b461dea2948c53e25a57f77246e2cc1ed1666 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Tue, 29 Mar 2011 08:14:28 -0400
Subject: [PATCH] rescue-module: now rescue of mysql works fine, even if the admin wanted to NOT rescue mysql
---
server/mods-available/rescue_core_module.inc.php | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/server/mods-available/rescue_core_module.inc.php b/server/mods-available/rescue_core_module.inc.php
index 6a86344..f1c34ca 100644
--- a/server/mods-available/rescue_core_module.inc.php
+++ b/server/mods-available/rescue_core_module.inc.php
@@ -89,14 +89,14 @@
$this->_rescueData = $this->_getRescueData();
/*
+ * rescue mysql if needed (maybe apache depends on mysql, so try this first!)
+ */
+ $this->_rescueMySql();
+
+ /*
* rescue apache if needed
*/
$this->_rescueApache();
-
- /*
- * rescue mysql if needed
- */
- $this->_rescueMySql();
/*
* The last step is to save the rescue-data
@@ -273,7 +273,6 @@
$app->log('Apache is down! Try rescue apache (try:' . $tryCount . ')...', LOGLEVEL_WARN);
-// echo 'Apache is down! Try rescue apache (try:' . $tryCount . ')...';
if(is_file($conf['init_scripts'] . '/' . 'httpd')) {
$daemon = 'httpd';
@@ -340,7 +339,6 @@
$app->log('MySQL is down! Try rescue mysql (try:' . $tryCount . ')...', LOGLEVEL_WARN);
-// echo 'MySQL is down! Try rescue mysql (try:' . $tryCount . ')...';
if(is_file($conf['init_scripts'] . '/' . 'mysqld')) {
$daemon = 'mysqld';
--
Gitblit v1.9.1