From 5bfd86d9447b048cd4c3fb63936ee1d4275c09f1 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 26 Apr 2021 21:21:01 +0200 Subject: [PATCH] Removed token trasnsactional_threads as manager only runs 1 thread --- pandora_server/FreeBSD/pandora_server.conf.new | 4 ---- pandora_server/conf/pandora_server.conf.new | 4 ---- pandora_server/conf/pandora_server.conf.windows | 4 ---- pandora_server/lib/PandoraFMS/Config.pm | 4 ---- 4 files changed, 16 deletions(-) diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index 2e14e0b0c1..74f70a8f54 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -433,10 +433,6 @@ snmp_threads 4 transactionalserver 0 -# Number of threads for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). - -transactional_threads 1 - # Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). transactional_threshold 2 diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 53ae7a4604..cab5e4ce37 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -499,10 +499,6 @@ snmp_threads 4 transactionalserver 0 -# Number of threads for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). - -transactional_threads 1 - # Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). transactional_threshold 2 diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index 195fc9ed7b..234cb4893a 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -427,10 +427,6 @@ snmp_threads 4 transactionalserver 0 -# Number of threads for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). - -transactional_threads 1 - # Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY). transactional_threshold 2 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index e0057f9da5..ba9ae222a3 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -260,7 +260,6 @@ sub pandora_load_config { $pa_config->{"webserver"} = 1; # 3.0 $pa_config->{"web_timeout"} = 60; # 6.0SP5 $pa_config->{"transactionalserver"} = 0; # Default 0, introduced on 6.1 - $pa_config->{"transactional_threads"} = 1; # Default 1, introduced on 6.1 $pa_config->{"transactional_threshold"} = 2; # Default 2, introduced on 6.1 $pa_config->{"transactional_pool"} = $pa_config->{"incomingdir"} . "/" . "trans"; # Default, introduced on 6.1 $pa_config->{'snmp_logfile'} = "/var/log/pandora_snmptrap.log"; @@ -747,9 +746,6 @@ sub pandora_load_config { elsif ($parametro =~ m/^transactionalserver\s+([0-9]*)/i) { $pa_config->{'transactionalserver'}= clean_blank($1); } - elsif ($parametro =~ m/^transactional_threads\s+([0-9]*)/i) { - $pa_config->{'transactional_threads'}= clean_blank($1); - } elsif ($parametro =~ m/^transactional_threshold\s+([0-9]*\.{0,1}[0-9]*)/i) { $pa_config->{'transactional_threshold'}= clean_blank($1); }