2009-10-20 Sancho Lerena <slerena@artica.es>
* 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. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2034 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena
parent
b762c99793
commit
2775251fe7
|
|
@ -1,3 +1,10 @@
|
|||
2009-10-20 Sancho Lerena <slerena@artica.es>
|
||||
|
||||
* 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 <miguel.dedios@artica.es>
|
||||
|
||||
* include/functions_custom_graphs.php, operation/reporting/graph_viewer.php,
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">Problem with Pandora FMS auth system</h1>
|
||||
|
|
@ -39,13 +39,18 @@
|
|||
<img src="images/pandora_logo.png" border="0"></a>
|
||||
</div>
|
||||
<div class="msg">
|
||||
Cannot override authorization variables from the config database. Remove them from your database by executing:<br><br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>
|
||||
Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file or read the documentation on how to setup Pandora FMS.<i><br /><br />
|
||||
Probably one or more of your user, database or hostname values are incorrect or
|
||||
the database server is not running.</i><br /><br /><span class="error">
|
||||
<b>MySQL ERROR:</b> <?php echo mysql_error() ?></span>
|
||||
</div>
|
||||
<div class="msg">
|
||||
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:<br><br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">Problem with Pandora FMS database</h1>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">Empty configuration table</h1>
|
||||
|
|
@ -49,7 +49,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,9 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">Installer active</h1>
|
||||
|
|
@ -47,6 +48,5 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">No configuration file found</h1>
|
||||
|
|
@ -48,7 +48,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id="main">
|
||||
|
||||
<div id="main" style='float:left; margin-left: 100px'>
|
||||
<div align='center'>
|
||||
<div id='login_f'>
|
||||
<h1 id="log_f" class="error">Bad permission for include/config.php</h1>
|
||||
|
|
@ -47,6 +47,5 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue