fix #490 Place LoggingHandler after ProxyHandler when there is such i…

…n the pipeline
reactor · Nov 1, 2018 · 8b41943 · 8b41943
1 parent 5df83ff
commit 8b41943
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/reactor/netty/channel/BootstrapHandlers.java b/src/main/java/reactor/netty/channel/BootstrapHandlers.java
@@ -575,12 +575,17 @@ public void accept(ConnectionObserver connectionObserver, Channel channel) {
 			if (pipeline.get(NettyPipeline.SslHandler) != null) {
 				if (debugSsl) {
 					pipeline.addBefore(NettyPipeline.SslHandler,
-									NettyPipeline.SslLoggingHandler,
-									new LoggingHandler("reactor.netty.tcp.ssl"));
+							NettyPipeline.SslLoggingHandler,
+							new LoggingHandler("reactor.netty.tcp.ssl"));
 				}
 				pipeline.addAfter(NettyPipeline.SslHandler,
-								NettyPipeline.LoggingHandler,
-								handler);
+						NettyPipeline.LoggingHandler,
+						handler);
+			}
+			else if (pipeline.get(NettyPipeline.ProxyHandler) != null) {
+				pipeline.addAfter(NettyPipeline.ProxyHandler,
+						NettyPipeline.LoggingHandler,
+						handler);
 			}
 			else {
 				pipeline.addFirst(NettyPipeline.LoggingHandler, handler);