Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 223B118BB7 for ; Thu, 12 Nov 2015 13:46:18 +0000 (UTC) Received: (qmail 5464 invoked by uid 500); 12 Nov 2015 13:46:18 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 5438 invoked by uid 500); 12 Nov 2015 13:46:18 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 5427 invoked by uid 99); 12 Nov 2015 13:46:18 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 13:46:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 9791BC0481 for ; Thu, 12 Nov 2015 13:46:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id GyiKZ7bqeFYV for ; Thu, 12 Nov 2015 13:46:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 41735441A9 for ; Thu, 12 Nov 2015 13:46:16 +0000 (UTC) Received: (qmail 5334 invoked by uid 99); 12 Nov 2015 13:46:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 13:46:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4282FE5E1F; Thu, 12 Nov 2015 13:46:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 12 Nov 2015 13:46:15 -0000 Message-Id: <605a2fca19e148ea8cab9d56ebfabcd4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] incubator-brooklyn git commit: Make SshMachineLocation.LOG private 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 Authored: Mon Nov 9 08:45:06 2015 +0000 Committer: Aled Sage 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();