From 36a6d2e33ca9a99249aa7872aceaf2a3dab41213 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 15 Jul 2014 16:51:59 +0100 Subject: [PATCH] No default for interactives made daemon die (H. Weber) --- Netdisco/Changes | 6 +++++- Netdisco/lib/App/Netdisco/Configuration.pm | 3 ++- Netdisco/share/config.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index fd7bdc00..1096a6cd 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,9 +1,13 @@ -2.028002_001 - 2014-07-13 +2.028002_002 - 2014-07-13 [NEW FEATURES] * GraphViz graph export (beta) + [BUG FIXES] + + * No default for interactives made daemon die (H. Weber) + 2.028001 - 2014-07-13 [NEW FEATURES] diff --git a/Netdisco/lib/App/Netdisco/Configuration.pm b/Netdisco/lib/App/Netdisco/Configuration.pm index d6db6a89..2dc444bc 100644 --- a/Netdisco/lib/App/Netdisco/Configuration.pm +++ b/Netdisco/lib/App/Netdisco/Configuration.pm @@ -41,8 +41,9 @@ setting('plugins')->{DBIC}->{daemon} = { schema_class => 'App::Netdisco::Daemon::DB', }; -# default queue model is Pg +# defaults for workers setting('workers')->{queue} ||= 'PostgreSQL'; +setting('workers')->{interactives} ||= 1; # force skipped DNS resolution, if unset setting('dns')->{hosts_file} ||= '/etc/hosts'; diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml index a5cfbf82..1205a086 100644 --- a/Netdisco/share/config.yml +++ b/Netdisco/share/config.yml @@ -166,7 +166,7 @@ port_control_reasons: # -------------- workers: - interactives: 2 + interactives: 1 pollers: 10 sleep_time: 2 queue: PostgreSQL