diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 65277defe9..09a5f25efc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-10-20 Sancho Lerena + + * include/functions_db.php: Fixed bug #2859919 (Transaction lock timeout). + + * include/error*: Fixed a formatting error and added better error + message when mysql is up but credentials doesn't work. + 2009-10-17 Miguel de Dios * include/functions_custom_graphs.php, operation/reporting/graph_viewer.php, diff --git a/pandora_console/general/error_authconfig.php b/pandora_console/general/error_authconfig.php index 7c3accbc85..39c9e0c13e 100644 --- a/pandora_console/general/error_authconfig.php +++ b/pandora_console/general/error_authconfig.php @@ -30,8 +30,8 @@ -
-
+ +

Problem with Pandora FMS auth system

@@ -39,13 +39,18 @@
- Cannot override authorization variables from the config database. Remove them from your database by executing:

DELETE FROM tconfig WHERE token = "auth";
+ Cannot connect to the database, please check your database setup in the include/config.php file or read the documentation on how to setup Pandora FMS.

+ Probably one or more of your user, database or hostname values are incorrect or + the database server is not running.

+ MySQL ERROR: +
+
+ If you have modified auth system, problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:

DELETE FROM tconfig WHERE token = "auth";
-
diff --git a/pandora_console/general/error_dbconfig.php b/pandora_console/general/error_dbconfig.php index 6f8e751925..787d4faa5a 100644 --- a/pandora_console/general/error_dbconfig.php +++ b/pandora_console/general/error_dbconfig.php @@ -30,8 +30,8 @@ -
-
+ +

Problem with Pandora FMS database

@@ -47,7 +47,7 @@
-
+
diff --git a/pandora_console/general/error_emptyconfig.php b/pandora_console/general/error_emptyconfig.php index 38b818a390..71f83d7f94 100644 --- a/pandora_console/general/error_emptyconfig.php +++ b/pandora_console/general/error_emptyconfig.php @@ -30,8 +30,8 @@ -
-
+ +

Empty configuration table

@@ -49,7 +49,6 @@
-
diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php index 8598c779b6..6a3cde6612 100644 --- a/pandora_console/general/error_install.php +++ b/pandora_console/general/error_install.php @@ -30,8 +30,9 @@ -
-
+ + +

Installer active

@@ -47,6 +48,5 @@
-
diff --git a/pandora_console/general/error_noconfig.php b/pandora_console/general/error_noconfig.php index fa1ad657c3..9e80e4771c 100644 --- a/pandora_console/general/error_noconfig.php +++ b/pandora_console/general/error_noconfig.php @@ -30,8 +30,8 @@ -
-
+ +

No configuration file found

@@ -48,7 +48,6 @@
-
diff --git a/pandora_console/general/error_perms.php b/pandora_console/general/error_perms.php index 2125b0c905..0b5d0dcc47 100644 --- a/pandora_console/general/error_perms.php +++ b/pandora_console/general/error_perms.php @@ -29,8 +29,8 @@ -
-
+ +

Bad permission for include/config.php

@@ -47,6 +47,5 @@
-
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 5366cac661..0435c3771e 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -2584,10 +2584,7 @@ function __ ($string /*, variable arguments */) { function check_server_status () { $sql = "SELECT COUNT(id_server) FROM tserver WHERE status = 1 AND keepalive > NOW() - INTERVAL 15 MINUTE"; $status = (int) get_db_sql ($sql); //Cast as int will assure a number value - // Set servers to down - if ($status == 0){ - process_sql ("UPDATE tserver SET status = 0"); - } + // This function should just ack of server down, not set it down. return $status; }