aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin/src
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2017-01-24 15:49:44 +0100
committerMartin Polden <martin.polden@gmail.com>2017-01-24 15:52:36 +0100
commita6616a676b264defc41c14be1ca60f5034615506 (patch)
tree363ca50a904ab85453c9bf874487609a9865aee0 /node-admin/src
parent5e7be56b9f51deecc510a5136397235338a96cc2 (diff)
Skip logging of IPv4 addresses
Infrastructure nodes are dual-stack so this avoids unnecessary logging.
Diffstat (limited to 'node-admin/src')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/AclMaintainer.java8
1 files changed, 1 insertions, 7 deletions
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));