[mina-sshd] branch master updated: fix braces in logs to print values properly

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git


The following commit(s) were added to refs/heads/master by this push:
     new 41bdef2  fix braces in logs to print values properly
     new d02fbcf  Merge pull request #109 from thefourtheye/fix-logs
41bdef2 is described below

commit 41bdef225f16960587e91db6897e481a907c4eca
Author: Sakthipriyan Vairamani (thefourtheye) <thechargingvolc...@gmail.com>
AuthorDate: Fri Nov 1 12:36:00 2019 +0530

    fix braces in logs to print values properly
---
 .../src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java  | 4 ++--
 .../sftp/extensions/helpers/AbstractSftpClientExtension.java       | 2 +-
 .../apache/sshd/client/subsystem/sftp/impl/AbstractSftpClient.java | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 
b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
index a0e1a68..665fe9b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
@@ -143,7 +143,7 @@ public class Nio2Session extends AbstractCloseable 
implements IoSession {
             socket.shutdownInput();
         } catch (IOException e) {
             if (debugEnabled) {
-                log.debug("suspend({}) failed {{}) to shutdown input: {}",
+                log.debug("suspend({}) failed ({}) to shutdown input: {}",
                     this, e.getClass().getSimpleName(), e.getMessage());
             }
         }
@@ -152,7 +152,7 @@ public class Nio2Session extends AbstractCloseable 
implements IoSession {
             socket.shutdownOutput();
         } catch (IOException e) {
             if (debugEnabled) {
-                log.debug("suspend({}) failed {{}) to shutdown output: {}",
+                log.debug("suspend({}) failed ({}) to shutdown output: {}",
                     this, e.getClass().getSimpleName(), e.getMessage());
             }
         }
diff --git 
a/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractSftpClientExtension.java
 
b/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractSftpClientExtension.java
index dc9379a..8953e10 100644
--- 
a/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractSftpClientExtension.java
+++ 
b/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractSftpClientExtension.java
@@ -182,7 +182,7 @@ public abstract class AbstractSftpClientExtension extends 
AbstractLoggingBean im
             String msg = buffer.getString();
             String lang = buffer.getString();
             if (log.isDebugEnabled()) {
-                log.debug("checkExtendedReplyBuffer({}}[id={}] - status: {} 
[{}] {}",
+                log.debug("checkExtendedReplyBuffer({})[id={}] - status: {} 
[{}] {}",
                           getName(), id, substatus, lang, msg);
             }
 
diff --git 
a/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/impl/AbstractSftpClient.java
 
b/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/impl/AbstractSftpClient.java
index 73e3969..5ac8db7 100644
--- 
a/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/impl/AbstractSftpClient.java
+++ 
b/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/impl/AbstractSftpClient.java
@@ -957,7 +957,7 @@ public abstract class AbstractSftpClient extends 
AbstractSubsystemClient impleme
 
         CloseableHandle handle = new DefaultCloseableHandle(this, path, 
checkHandle(SftpConstants.SSH_FXP_OPENDIR, buffer));
         if (log.isTraceEnabled()) {
-            log.trace("openDir({})[{}}: {}", getClientChannel(), path, handle);
+            log.trace("openDir({})[{}]: {}", getClientChannel(), path, handle);
         }
 
         return handle;
@@ -1004,7 +1004,7 @@ public abstract class AbstractSftpClient extends 
AbstractSubsystemClient impleme
 
             boolean debugEnabled = log.isDebugEnabled();
             if (debugEnabled) {
-                log.debug("checkDirResponse({}}[id={}] reading {} entries", 
channel, id, count);
+                log.debug("checkDirResponse({})[id={}] reading {} entries", 
channel, id, count);
             }
 
             List<DirEntry> entries = new ArrayList<>(count);
@@ -1031,7 +1031,8 @@ public abstract class AbstractSftpClient extends 
AbstractSubsystemClient impleme
             }
 
             if (debugEnabled) {
-                log.debug("checkDirResponse({}}[id={}] read count={}, eol={}", 
channel, entries.size(), indicator);
+                log.debug("checkDirResponse({})[id={}] read count={}, eol={}",
+                        channel, id, entries.size(), indicator);
             }
             return entries;
         }