From 3836d05119dbeb77360f986eaf3d6d4f1e127e09 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Fri, 5 Feb 2016 09:16:22 +0100 Subject: [PATCH] Satellite Server is not master anymore TICKETS #3346 --- pandora_server/lib/PandoraFMS/Core.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 46ede71ec6..6cb82816fc 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -2192,6 +2192,10 @@ sub pandora_update_server ($$$$$$;$$$) { my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); $version = $pa_config->{'version'} . ' (P) ' . $pa_config->{'build'} unless defined($version); + my $master = ($server_type == SATELLITESERVER) ? 0 : $pa_config->{'pandora_master'}; + + logger ($pa_config, "UPDATING SERVER: " . $server_name, 1); + # First run if ($server_id == 0) { @@ -2213,12 +2217,12 @@ sub pandora_update_server ($$$$$$;$$$) { db_do ($dbh, 'UPDATE tserver SET status = ?, keepalive = ?, master = ?, laststart = ?, version = ?, threads = ?, queued_modules = ? WHERE id_server = ?', - 1, $timestamp, $pa_config->{'pandora_master'}, $timestamp, $version, $num_threads, $queue_size, $server_id); + 1, $timestamp, $master, $timestamp, $version, $num_threads, $queue_size, $server_id); return; } db_do ($dbh, 'UPDATE tserver SET status = ?, keepalive = ?, master = ?, version = ?, threads = ?, queued_modules = ? - WHERE id_server = ?', $status, $timestamp, $pa_config->{'pandora_master'}, $version, $num_threads, $queue_size, $server_id); + WHERE id_server = ?', $status, $timestamp, $master, $version, $num_threads, $queue_size, $server_id); } ##########################################################################