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

Quieten AnyEvent::DNS::EtcHosts check on PERL_ANYEVENT_HOSTS env var

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-09 12:53:22 +00:00
parent 31e8e29dff
commit d1b707da31
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -24,6 +24,7 @@
* Correct date formatting and logic in IP Inventory report * Correct date formatting and logic in IP Inventory report
* Fix redirect when accessing a deep link when unauthenticated * Fix redirect when accessing a deep link when unauthenticated
* [#46] Sorting on Inventory page same as ND1 * [#46] Sorting on Inventory page same as ND1
* Quieten AnyEvent::DNS::EtcHosts check on PERL_ANYEVENT_HOSTS env var
2.022000 - 2014-01-26 2.022000 - 2014-01-26

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

@@ -26,9 +26,11 @@ use Role::Tiny::With;
use MCE::Signal '-setpgrp'; use MCE::Signal '-setpgrp';
use MCE; use MCE;
# set max outstanding requests for AnyEvent::DNS # set defaults for AnyEvent::DNS
local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'}
= setting('dns')->{max_outstanding} || 10; = 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});

2
Netdisco/bin/netdisco-do
View File

@@ -58,6 +58,8 @@ Dancer::Logger->init('console', $CONFIG);
# set max outstanding requests for AnyEvent::DNS # set max outstanding requests for AnyEvent::DNS
local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'} local $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'}
= setting('dns')->{max_outstanding} || 10; = 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;

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

@@ -81,6 +81,7 @@ setting('plugins')->{DBIC}->{daemon} = {
# force skipped DNS resolution, if unset # force skipped DNS resolution, if unset
setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16']; setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16'];
setting('dns')->{hosts_file} ||= '/etc/hosts';
=head1 NAME =head1 NAME

11
Netdisco/lib/App/Netdisco/Manual/Configuration.pod
View File

@@ -648,14 +648,21 @@ of days will be removed.
=head3 C<dns> =head3 C<dns>
Value: Settings Tree. Default: C<max_outstanding: 250> Value: Settings Tree. Default:
dns:
max_outstanding: 10
hosts_file: '/etc/hosts'
no: ['fe80::/64','169.254.0.0/16']
After arpnip, each found IP will have its DNS name resolved. Similarly on After arpnip, each found IP will have its DNS name resolved. Similarly on
device discovery, all interface aliases will have their IPs resolved to names. device discovery, all interface aliases will have their IPs resolved to names.
This setting controls how many outstanding DNS queries are permitted at any This setting controls how many outstanding DNS queries are permitted at any
time. You can also override this setting using the time. You can also override this setting using the
C<PERL_ANYEVENT_MAX_OUTSTANDING_DNS> environment variable. C<PERL_ANYEVENT_MAX_OUTSTANDING_DNS> environment variable. Similarly, the
location of the Hosts file can be overridden in this config, or using the
C<PERL_ANYEVENT_HOSTS> environment variable.
=head3 C<store_wireless_clients> =head3 C<store_wireless_clients>

3
Netdisco/share/config.yml
View File

@@ -165,8 +165,9 @@ workers:
sleep_time: 2 sleep_time: 2
dns: dns:
no: ['fe80::/64','169.254.0.0/16']
max_outstanding: 10 max_outstanding: 10
hosts_file: '/etc/hosts'
no: ['fe80::/64','169.254.0.0/16']
#housekeeping: #housekeeping:
# discoverall: # discoverall: