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

Forward port housekeeping/schedule and expiry/expire legacy config

Browse Source
This commit is contained in:
Oliver Gorwits
2014-06-03 15:21:43 +00:00
parent 1258049483
commit 37dbb9527c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -9,6 +9,7 @@
[BUG FIXES] [BUG FIXES]
* Fix for device counts in VLAN Inventory report * Fix for device counts in VLAN Inventory report
* Forward port housekeeping/schedule and expiry/expire legacy config
2.027007 - 2014-05-27 2.027007 - 2014-05-27

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

@@ -47,9 +47,15 @@ setting('workers')->{queue} ||= 'PostgreSQL';
setting('dns')->{hosts_file} ||= '/etc/hosts'; setting('dns')->{hosts_file} ||= '/etc/hosts';
setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16']; setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16'];
# cope with legacy config name
config->{'schedule'} = config->{'housekeeping'}
if setting('housekeeping') and not setting('schedule');
delete config->{'housekeeping'};
# schedule expire used to be called expiry # schedule expire used to be called expiry
setting('schedule')->{expire} ||= setting('schedule')->{expiry} setting('schedule')->{expire} ||= setting('schedule')->{expiry}
if setting('schedule') and exists setting('schedule')->{expiry}; if setting('schedule') and exists setting('schedule')->{expiry};
delete config->{'schedule'}->{'expiry'};
# set max outstanding requests for AnyEvent::DNS # set max outstanding requests for AnyEvent::DNS
$ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'}