diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-07-20 08:50:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 08:50:50 +0200 |
| commit | 7bf195eb539a6d39664f643ba16a973392157c48 (patch) | |
| tree | 8ebd2d543c412c6f6e7f3ac4ec9a61fa022793b0 | |
| parent | 5b057bd57c6566799578e5f4c75310b88abf421f (diff) | |
| parent | d2386ce82db90d509de3b39c8bc2249e6e104f9f (diff) | |
Merge pull request #2981 from yahoo/hmusum/add-container-name-to-log-message
Add container name to log messages
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java index 4e2d6332a46..b202e615341 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java @@ -63,25 +63,25 @@ public class AclMaintainer implements Runnable { } final Command flush = new FlushCommand(Chain.INPUT); final Command rollback = new PolicyCommand(Chain.INPUT, Action.ACCEPT); - log.info("Start modifying ACL rules"); + log.info("Start modifying ACL rules for " + containerName.asString()); try { log.info("Running ACL command '" + flush.asString() + "'"); dockerOperations.executeCommandInNetworkNamespace(containerName, flush.asArray(IPTABLES_COMMAND)); acl.toCommands().forEach(command -> { - log.info("Running ACL command '" + command.asString() + "'"); + log.info("Running ACL command '" + command.asString() + "' for " + containerName.asString()); dockerOperations.executeCommandInNetworkNamespace(containerName, command.asArray(IPTABLES_COMMAND)); }); containerAcls.put(containerName, acl); } catch (Exception e) { - log.error("Exception occurred while configuring ACLs, attempting rollback", e); + log.error("Exception occurred while configuring ACLs for " + containerName.asString() + ", attempting rollback", e); try { dockerOperations.executeCommandInNetworkNamespace(containerName, rollback.asArray(IPTABLES_COMMAND)); } catch (Exception ne) { - log.error("Rollback failed, giving up", ne); + log.error("Rollback of ACLs for " + containerName.asString() + " failed, giving up", ne); } } - log.info("Finished modifying ACL rules"); + log.info("Finished modifying ACL rules for " + containerName.asString()); } private synchronized void configureAcls() { |