Repository: incubator-brooklyn Updated Branches: refs/heads/master 78df97a0c -> 443ed5e8d
Make SshMachineLocation.LOG private Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/16d78e67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/16d78e67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/16d78e67 Branch: refs/heads/master Commit: 16d78e6760278c32df33d4f1fc38c71c599fc19c Parents: 78df97a Author: Aled Sage <[email protected]> Authored: Mon Nov 9 08:45:06 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Thu Nov 12 13:11:41 2015 +0000 ---------------------------------------------------------------------- .../localhost/LocalhostMachineProvisioningLocation.java | 2 ++ .../org/apache/brooklyn/location/ssh/SshMachineLocation.java | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/16d78e67/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java index cf11cfd..3e8b01d 100644 --- a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java @@ -245,6 +245,8 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis } public static class LocalhostMachine extends SshMachineLocation implements HasSubnetHostname { + private static final Logger LOG = LoggerFactory.getLogger(LocalhostMachine.class); + // declaring this here (as well as on LocalhostMachineProvisioningLocation) because: // 1. machine.getConfig(key) will not inherit default value of machine.getParent()'s key // 2. things might instantiate a `LocalhostMachine` without going through LocalhostMachineProvisioningLocation http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/16d78e67/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java index 27f87f9..2cf1690 100644 --- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java @@ -134,10 +134,8 @@ import groovy.lang.Closure; */ public class SshMachineLocation extends AbstractLocation implements MachineLocation, PortSupplier, WithMutexes, Closeable { - /** @deprecated since 0.7.0 shouldn't be public */ - public static final Logger LOG = LoggerFactory.getLogger(SshMachineLocation.class); - /** @deprecated since 0.7.0 shouldn't be public */ - public static final Logger logSsh = LoggerFactory.getLogger(BrooklynLogging.SSH_IO); + private static final Logger LOG = LoggerFactory.getLogger(SshMachineLocation.class); + private static final Logger logSsh = LoggerFactory.getLogger(BrooklynLogging.SSH_IO); // Use a sane timeout when doing a connectivity test private static final int SSHABLE_CONNECT_TIMEOUT = (int)Duration.minutes(2).toMilliseconds();
