From 614365f8e1e61b6e1cfa34fd8084a31b235c944b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 Jul 2008 13:10:03 +0000
Subject: [PATCH] The server log priority setting is now preserved when the
system is updated.
---
install/dist/conf/debian40.conf.php | 1 +
install/lib/installer_base.lib.php | 1 +
install/tpl/config.inc.php.master | 2 +-
install/update.php | 1 +
.../mysql_clientdb_plugin.inc.php | 14 ++++++++++----
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php
index a8a90bee5..266947b0a 100644
--- a/install/dist/conf/debian40.conf.php
+++ b/install/dist/conf/debian40.conf.php
@@ -8,6 +8,7 @@ $conf['distname'] = 'debian40';
$conf['hostname'] = 'server1.example.com'; // Full hostname
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
+$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
$conf['server_id'] = 1;
$conf['init_scripts'] = '/etc/init.d';
$conf['runlevel'] = '/etc';
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 841e402d0..3a19be939 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -705,6 +705,7 @@ class installer_base {
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
$content = str_replace('{server_id}', $conf['server_id'], $content);
+ $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
wf("$install_dir/server/lib/$configfile", $content);
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 2350f41cd..e058a59c9 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -106,7 +106,7 @@ define("DB_PASSWORD",$conf["db_password"]);
*/
$conf["log_file"] = $conf["rootpath"].$conf["fs_div"]."ispconfig.log";
-$conf["log_priority"] = 2; // 0 = Debug, 1 = Warning, 2 = Error
+$conf["log_priority"] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error
/*
Themes
diff --git a/install/update.php b/install/update.php
index 32b7400e8..bc243eba8 100644
--- a/install/update.php
+++ b/install/update.php
@@ -82,6 +82,7 @@ $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['server_id'] = $conf_old["server_id"];
+$conf['ispconfig_log_priority'] = $conf_old["ispconfig_log_priority"];
$inst = new installer();
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index 7055c41e3..81ada6ed8 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -175,11 +175,17 @@ class mysql_clientdb_plugin {
$db_host = 'localhost';
}
- mysql_query("DROP USER '".addslashes($data["old"]["database_user"])."'@'$db_host';",$link);
- $app->log('Dropping mysql user: '.$data["old"]["database_user"],LOGLEVEL_DEBUG);
+ if(mysql_query("DROP USER '".addslashes($data["old"]["database_user"])."'@'$db_host';",$link)) {
+ $app->log('Dropping mysql user: '.$data["old"]["database_user"],LOGLEVEL_DEBUG);
+ } else {
+ $app->log('Error while dropping mysql user: '.$data["old"]["database_user"].' '.mysql_error($link),LOGLEVEL_ERROR);
+ }
- mysql_query('DROP DATABASE '.addslashes($data["old"]["database_name"]),$link);
- $app->log('Dropping mysql database: '.$data["old"]["database_name"],LOGLEVEL_DEBUG);
+ if(mysql_query('DROP DATABASE '.addslashes($data["old"]["database_name"]),$link)) {
+ $app->log('Dropping mysql database: '.$data["old"]["database_name"],LOGLEVEL_DEBUG);
+ } else {
+ $app->log('Error while dropping mysql database: '.$data["old"]["database_name"].' '.mysql_error($link),LOGLEVEL_ERROR);
+ }
mysql_query("FLUSH PRIVILEGES;",$link);
--
GitLab