tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop' 

fixed errors caase sensitive servername

See merge request !583
This commit is contained in:
vgilc 2017-06-14 10:41:46 +02:00
parent d090692412 d85ec51220
commit 91f8e9d65c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_api.php
View File

@ -1282,7 +1282,7 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
$sql1 = 'SELECT name $sql1 = 'SELECT name
FROM tserver WHERE name LIKE "' . $nameServer . '"'; FROM tserver WHERE BINARY name LIKE "' . $nameServer . '"';
break; break;
case "postgresql": case "postgresql":
case "oracle": case "oracle":

8
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -2253,7 +2253,7 @@ sub pandora_reset_server ($$) {
db_do ($dbh, 'UPDATE tserver db_do ($dbh, 'UPDATE tserver
SET status = 0, threads = 0, queued_modules = 0 SET status = 0, threads = 0, queued_modules = 0
WHERE name = ?', $pa_config->{'servername'}); WHERE BINARY name = ?', $pa_config->{'servername'});
} }
########################################################################## ##########################################################################
@ -2287,7 +2287,7 @@ sub pandora_update_server ($$$$$$;$$$$) {
if ($server_id == 0) { if ($server_id == 0) {
# Create an entry in tserver if needed # Create an entry in tserver if needed
my $server = get_db_single_row ($dbh, 'SELECT id_server FROM tserver WHERE name = ? AND server_type = ?', $server_name, $server_type); my $server = get_db_single_row ($dbh, 'SELECT id_server FROM tserver WHERE BINARY name = ? AND server_type = ?', $server_name, $server_type);
if (! defined ($server)) { if (! defined ($server)) {
$server_id = db_insert ($dbh, 'id_server', 'INSERT INTO tserver (name, server_type, description, version, threads, queued_modules, server_keepalive) $server_id = db_insert ($dbh, 'id_server', 'INSERT INTO tserver (name, server_type, description, version, threads, queued_modules, server_keepalive)
VALUES (?, ?, ?, ?, ?, ?, ?)', $server_name, $server_type, VALUES (?, ?, ?, ?, ?, ?, ?)', $server_name, $server_type,
@ -4259,7 +4259,7 @@ sub pandora_server_statistics ($$) {
my $lag_row; my $lag_row;
# Get all servers with my name (each server only refresh it's own stats) # Get all servers with my name (each server only refresh it's own stats)
my @servers = get_db_rows ($dbh, 'SELECT * FROM tserver WHERE name = ?', $pa_config->{'servername'}); my @servers = get_db_rows ($dbh, 'SELECT * FROM tserver WHERE BINARY name = ?', $pa_config->{'servername'});
# For each server, update stats: Simple. # For each server, update stats: Simple.
foreach my $server (@servers) { foreach my $server (@servers) {
@ -4613,7 +4613,7 @@ sub pandora_self_monitoring ($$) {
$agents_unknown = 0 if (!defined($agents_unknown)); $agents_unknown = 0 if (!defined($agents_unknown));
} }
my $queued_modules = get_db_value ($dbh, "SELECT SUM(queued_modules) FROM tserver WHERE name = '".$pa_config->{"servername"}."'"); my $queued_modules = get_db_value ($dbh, "SELECT SUM(queued_modules) FROM tserver WHERE BINARY name = '".$pa_config->{"servername"}."'");
if (!defined($queued_modules)) { if (!defined($queued_modules)) {
$queued_modules = 0; $queued_modules = 0;

2
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -203,7 +203,7 @@ sub get_server_id ($$$) {
my ($dbh, $server_name, $server_type) = @_; my ($dbh, $server_name, $server_type) = @_;
my $rc = get_db_value ($dbh, "SELECT id_server FROM tserver my $rc = get_db_value ($dbh, "SELECT id_server FROM tserver
WHERE name = ? AND server_type = ?", WHERE BINARY name = ? AND server_type = ?",
$server_name, $server_type); $server_name, $server_type);
return defined ($rc) ? $rc : -1; return defined ($rc) ? $rc : -1;
} }