From 0e381b3d001c49d15fb8bf23af5f91fdda26e87b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 17 Mar 2009 07:23:39 -0400
Subject: [PATCH] Improved mysql error logging.
---
server/server.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/server.php b/server/server.php
index 06aa242..29c07a3 100644
--- a/server/server.php
+++ b/server/server.php
@@ -68,7 +68,7 @@
$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
-if($app->dbmaster->connect()) {
+if($app->db->connect() && $app->dbmaster->connect()) {
// get the dalaog_id of the last performed record
$server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]);
@@ -114,7 +114,11 @@
$app->plugins->loadPlugins('core');
}
} else {
- $app->log("Unable to connect to master server.",LOGLEVEL_WARN);
+ if(!$app->db->connect()) {
+ $app->log("Unable to connect to local server.".$app->db->errorMessage,LOGLEVEL_WARN);
+ } else {
+ $app->log("Unable to connect to master server.".$app->dbmaster->errorMessage,LOGLEVEL_WARN);
+ }
}
// Remove lock
--
Gitblit v1.9.1