135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move default env settings to Netdisco.pm

Browse Source
This commit is contained in:
Oliver Gorwits
2014-04-24 21:05:42 +01:00
parent b4b5cce00a
commit 349bddf609
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/bin/netdisco-daemon-fg
View File

@@ -28,12 +28,6 @@ use Role::Tiny::With;
use MCE::Signal '-setpgrp'; use MCE::Signal '-setpgrp';
use MCE; 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 # set temporary MCE files' location in home directory
my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME}); my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
my $tmp_dir = ($ENV{NETDISCO_TEMP} || dir($home, 'tmp')); my $tmp_dir = ($ENV{NETDISCO_TEMP} || dir($home, 'tmp'));

6
Netdisco/bin/netdisco-do
View File

@@ -59,12 +59,6 @@ $CONFIG->{log} = ($debug ? 'debug' : 'info');
# reconfigure logging to force console output # reconfigure logging to force console output
Dancer::Logger->init('console', $CONFIG); 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 # for the in-memory local job queue
schema('daemon')->deploy; schema('daemon')->deploy;

6
Netdisco/lib/App/Netdisco.pm
View File

@@ -54,6 +54,12 @@ setting('dns')->{hosts_file} ||= '/etc/hosts';
setting('housekeeping')->{expire} ||= setting('housekeeping')->{expiry} setting('housekeeping')->{expire} ||= setting('housekeeping')->{expiry}
if setting('housekeeping') and exists 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 =head1 NAME
App::Netdisco - An open source web-based network management tool. App::Netdisco - An open source web-based network management tool.