tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check server remote config every keepalive time and not server_threshold

Browse Source
This commit is contained in:
fermin831 2015-10-14 19:10:16 +02:00
parent fecceb401f
commit 6a709d20ef
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_server/bin/pandora_server
View File

@ -580,6 +580,8 @@ sub main() {
# Main loop # Main loop
my $time_ref = time (); my $time_ref = time ();
my $test_remote_interval = ($Config{'keepalive'}/$Config{'server_threshold'});
my $test_remote = 0;
while ($RUN == 1) { while ($RUN == 1) {
eval { eval {
@ -628,6 +630,7 @@ sub main() {
close (OLDOUT); close (OLDOUT);
} }
if ($test_remote >= $test_remote_interval) {
if ($Config{'remote_config'} == 1 && enterprise_hook ('pandora_remote_config_server', [\%Config])) { if ($Config{'remote_config'} == 1 && enterprise_hook ('pandora_remote_config_server', [\%Config])) {
# Generate 'restarting' events # Generate 'restarting' events
@ -635,10 +638,15 @@ sub main() {
$server->restartEvent ($@); $server->restartEvent ($@);
} }
logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in 10 seconds.', 1); logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in 5 seconds.', 1);
pandora_load_config (\%Config); pandora_load_config (\%Config);
pandora_restart (5); pandora_restart (5);
} }
$test_remote = 0;
}
else {
$test_remote++;
}
threads->yield; threads->yield;
sleep ($Config{'server_threshold'}); sleep ($Config{'server_threshold'});