From 60352b8490220cfeecc99ca51d73b867f563838c Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 19 Dec 2018 17:16:12 +0300
Subject: [PATCH] Fixed - error during channel initialization is not logged.
 #1566

---
 .../org/redisson/client/handler/CommandDecoder.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
index 8744c37cb..b73dba41d 100644
--- a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
+++ b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
@@ -143,6 +143,17 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                 sendNext(ctx);
                 throw e;
             }
+        } else {
+            try {
+                while (in.writerIndex() > in.readerIndex()) {
+                    decode(in, null, null, ctx.channel(), false);
+                }
+                sendNext(ctx);
+            } catch (Exception e) {
+                log.error("Unable to decode data. channel: {} message: {}", ctx.channel(), in.toString(0, in.writerIndex(), CharsetUtil.UTF_8), e);
+                sendNext(ctx);
+                throw e;
+            }
         }
     }
 
@@ -335,7 +346,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                     if (data != null) {
                         data.tryFailure(new RedisException(error + ". channel: " + channel + " command: " + LogHelper.toString(data)));
                     } else {
-                        log.error("Error: {} channel: {} data: {}", error, channel, LogHelper.toString(data));
+                        log.error("Error message from Redis: {} channel: {}", error, channel);
                     }
                 }
             } finally {
-- 
GitLab