From b80800ee19dd06cd8ca6b7769e5a045940f02633 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Sat, 15 Dec 2018 00:17:23 +0100 Subject: [PATCH] Remove master configuration setting "use_default_node" The setting was introduced in 6adf38ae61a. But somehow it partially lost its meaning in the merge commit c8228b8e5bb (Merge branch 'sql' into devel). Afterwards it was only used for for breaking the node communication in case of a missing "host" attribute (which can never be empty as it is an integral part of the node specification in the master configuration). Thus it is not useful anymore. The purpose of this setting was later replaced with "use_node_name ignore" in dd4cbb501ca. --- lib/Munin/Master/Config.pm | 1 - lib/Munin/Master/Node.pm | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib/Munin/Master/Config.pm b/lib/Munin/Master/Config.pm index d0980dbb2e..2e00e0c542 100644 --- a/lib/Munin/Master/Config.pm +++ b/lib/Munin/Master/Config.pm @@ -122,7 +122,6 @@ my %booleans = map {$_ => 1} qw( tls_verify_certificate update use_node_name - use_default_node ); diff --git a/lib/Munin/Master/Node.pm b/lib/Munin/Master/Node.pm index 8708964be4..ae4a457b71 100644 --- a/lib/Munin/Master/Node.pm +++ b/lib/Munin/Master/Node.pm @@ -247,14 +247,6 @@ sub list_plugins { ? $self->{node_name} : $self->{host}; - my $use_default_node = defined($self->{configref}{use_default_node}) - ? $self->{configref}{use_default_node} - : $config->{use_default_node}; - - if (! $use_default_node && ! $host) { - die "[ERROR] Couldn't find out which host to list on $host.\n"; - } - my $host_list = ($use_node_name && $use_node_name eq "ignore") ? "" : $host; $self->_node_write_single("list $host_list\n"); my $list = $self->_node_read_single();