tbrehm
2009-03-17 0e381b3d001c49d15fb8bf23af5f91fdda26e87b
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