From 9938f6715246fe3f3af41112d83c7ba8e234ea8e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 22 Feb 2014 12:51:37 -0500
Subject: [PATCH] Fixed: FS#3189 - APS Installation Issues

---
 server/lib/classes/aps_installer.inc.php |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 64e7dd2..5503464 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -370,6 +370,19 @@
 
 		$tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_login' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
 		$newdb_login = $tmp['value'];
+		
+		/* Test if the new mysql connection is laready working to ensure that db servers in multiserver
+		   setups get enough time to create the database */
+		for($n = 1; $n < 15; $n++) {
+			$mysqli = new mysqli($newdb_host, $newdb_login, $newdb_pw, $newdb_name);
+			if ($mysqli->connect_error) {
+				unset($mysqli);
+				sleep(5);
+			} else {
+				unset($mysqli);
+				break;
+			}
+		}
 
 		$this->putenv[] = 'DB_'.$db_id.'_TYPE=mysql';
 		$this->putenv[] = 'DB_'.$db_id.'_NAME='.$newdb_name;

--
Gitblit v1.9.1