From 349bddf609090fe19831c51709fdff03258132a6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 24 Apr 2014 21:05:42 +0100 Subject: [PATCH] move default env settings to Netdisco.pm --- Netdisco/bin/netdisco-daemon-fg | 6 ------ Netdisco/bin/netdisco-do | 6 ------ Netdisco/lib/App/Netdisco.pm | 6 ++++++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg index 73b3cabb..ccb18a94 100755 --- a/Netdisco/bin/netdisco-daemon-fg +++ b/Netdisco/bin/netdisco-daemon-fg @@ -28,12 +28,6 @@ use Role::Tiny::With; use MCE::Signal '-setpgrp'; use MCE; -# set defaults for AnyEvent::DNS -local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} - = setting('dns')->{max_outstanding} || 10; -local $ENV{'PERL_ANYEVENT_HOSTS'} - = setting('dns')->{hosts_file} || '/etc/hosts'; - # set temporary MCE files' location in home directory my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME}); my $tmp_dir = ($ENV{NETDISCO_TEMP} || dir($home, 'tmp')); diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do index 8b633d5f..85feea73 100755 --- a/Netdisco/bin/netdisco-do +++ b/Netdisco/bin/netdisco-do @@ -59,12 +59,6 @@ $CONFIG->{log} = ($debug ? 'debug' : 'info'); # reconfigure logging to force console output Dancer::Logger->init('console', $CONFIG); -# set max outstanding requests for AnyEvent::DNS -local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} - = setting('dns')->{max_outstanding} || 10; -local $ENV{'PERL_ANYEVENT_HOSTS'} - = setting('dns')->{hosts_file} || '/etc/hosts'; - # for the in-memory local job queue schema('daemon')->deploy; diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index 4d298a4b..2bb86c15 100644 --- a/Netdisco/lib/App/Netdisco.pm +++ b/Netdisco/lib/App/Netdisco.pm @@ -54,6 +54,12 @@ setting('dns')->{hosts_file} ||= '/etc/hosts'; setting('housekeeping')->{expire} ||= setting('housekeeping')->{expiry} if setting('housekeeping') and exists setting('housekeeping')->{expiry}; +# set max outstanding requests for AnyEvent::DNS +$ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} + = setting('dns')->{max_outstanding} || 10; +$ENV{'PERL_ANYEVENT_HOSTS'} + = setting('dns')->{hosts_file} || '/etc/hosts'; + =head1 NAME App::Netdisco - An open source web-based network management tool.