From a6616a676b264defc41c14be1ca60f5034615506 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 24 Jan 2017 15:49:44 +0100 Subject: Skip logging of IPv4 addresses Infrastructure nodes are dual-stack so this avoids unnecessary logging. --- .../yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'node-admin/src') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java index 4deefff44c5..d5d2339d7bd 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java @@ -56,13 +56,7 @@ public class AclMaintainer implements Runnable { dockerOperations.executeCommandInNetworkNamespace(containerName, IpTables.flushChain()); aclSpecs.stream() .map(ContainerAclSpec::ipAddress) - .filter(ipAddress -> { - final boolean isIpv6 = isIpv6(ipAddress); - if (!isIpv6) { - log.warning("Skipping unexpected IPv4 address in ACL configuration: " + ipAddress); - } - return isIpv6; - }) + .filter(AclMaintainer::isIpv6) .forEach(ipAddress -> dockerOperations.executeCommandInNetworkNamespace(containerName, IpTables.allowFromAddress(ipAddress))); dockerOperations.executeCommandInNetworkNamespace(containerName, IpTables.chainPolicy(Policy.DROP)); -- cgit v1.2.3