diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index bdcc466913..798eeadc24 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -817,5 +817,5 @@ madeserver_autofit 7d madeserver_sensitivity 0.1 # If set to 1, Pandora FMS servers will run in separate processes. -fork 0 +multiprocess 0 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 80e2845c4a..f80ca74458 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -589,7 +589,7 @@ sub pandora_load_config { $pa_config->{"madeserver"} = 0; # 774. - $pa_config->{"fork"} = 0; # 775. + $pa_config->{"multiprocess"} = 0; # 775. # Check for UID0 if ($pa_config->{"quiet"} != 0){ @@ -1414,8 +1414,8 @@ sub pandora_load_config { elsif ($parametro =~ m/^madeserver\s+([0-1])/i){ $pa_config->{'madeserver'}= clean_blank($1); } - elsif ($parametro =~ m/^fork\s+([0-1])/i){ - $pa_config->{'fork'}= clean_blank($1); + elsif ($parametro =~ m/^multiprocess\s+([0-1])/i){ + $pa_config->{'multiprocess'}= clean_blank($1); } } # end of loop for parameter # diff --git a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm index 78e0c244ac..dbaf0ab049 100644 --- a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm +++ b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm @@ -56,7 +56,7 @@ sub new ($$$$$;$) { $self->{'_consumer'} = $consumer; # Configure forking - $self->{'_fork'} = $config->{'fork'} == 1 ? 1 : 0; + $self->{'_fork'} = $config->{'multiprocess'} == 1 ? 1 : 0; $self->{'_child_pid'} = undef; # Run!