You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2015/11/16 07:16:11 UTC
[2/2] mina-sshd git commit: Demoted some log messages from INFO to
DEBUG level
Demoted some log messages from INFO to DEBUG level
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/67f75c24
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/67f75c24
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/67f75c24
Branch: refs/heads/master
Commit: 67f75c24bcd04845ad3b4083d9255601f7db8a5c
Parents: c3be4f3
Author: Lyor Goldstein <lg...@vmware.com>
Authored: Mon Nov 16 08:15:59 2015 +0200
Committer: Lyor Goldstein <lg...@vmware.com>
Committed: Mon Nov 16 08:15:59 2015 +0200
----------------------------------------------------------------------
.../org/apache/sshd/client/session/ClientConnectionService.java | 4 +++-
.../java/org/apache/sshd/client/session/ClientSessionImpl.java | 2 +-
.../main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java | 4 +++-
.../main/java/org/apache/sshd/server/shell/ProcessShell.java | 5 ++++-
4 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/67f75c24/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
index bd8d0db..db400aa 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
@@ -77,7 +77,9 @@ public class ClientConnectionService extends AbstractConnectionService {
buf.putBoolean(false);
session.writePacket(buf);
} catch (IOException e) {
- log.info("Error sending keepalive message=" + request, e);
+ if (log.isDebugEnabled()) {
+ log.debug("Error (" + e.getClass().getSimpleName() + ") sending keepalive message=" + request + ": " + e.getMessage());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/67f75c24/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
index ce597ec..06c0a6e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
@@ -329,7 +329,7 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession
} else if ((!c2sEncClientNone) || (!s2cEncClientNone)) {
kexFuture.setValue(new SshException("Client does not support none cipher"));
} else {
- log.info("Switching to none cipher");
+ log.info("Switching to none cipher " + this);
Map<KexProposalOption, String> proposal = new EnumMap<KexProposalOption, String>(KexProposalOption.class);
synchronized (clientProposal) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/67f75c24/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
index b9d6a22..3a96e00 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
@@ -160,7 +160,9 @@ public class UserAuthGSS extends AbstractUserAuth {
if (established && (identity == null)) {
identity = context.getSrcName().toString();
- log.info("GSS identity is {}", identity);
+ if (log.isDebugEnabled()) {
+ log.info("GSS identity is {}", identity);
+ }
if (!auth.validateIdentity(session, identity)) {
return Boolean.FALSE;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/67f75c24/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java
index 1fa9b6f..b964506 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java
@@ -73,7 +73,10 @@ public class ProcessShell extends AbstractLoggingBean implements InvertedShell {
}
}
- log.info("Starting shell with command: '{}' and env: {}", builder.command(), builder.environment());
+ if (log.isDebugEnabled()) {
+ log.debug("Starting shell with command: '{}' and env: {}", builder.command(), builder.environment());
+ }
+
process = builder.start();
out = new TtyFilterInputStream(process.getInputStream(), ttyOptions);
err = new TtyFilterInputStream(process.getErrorStream(), ttyOptions);