Merge pull request #412 from kachayev/ft-channel-initializer

Use built-in ChannelInitializer

Author: ztellman

src/aleph/netty.clj

@@ -21,7 +21,8 @@
      ChannelHandler FileRegion
      ChannelInboundHandler
      ChannelOutboundHandler
-     ChannelHandlerContext]
+     ChannelHandlerContext
+     ChannelInitializer]
     [io.netty.channel.epoll Epoll EpollEventLoopGroup
      EpollServerSocketChannel
      EpollSocketChannel]
@@ -627,18 +628,9 @@
         (.write ctx msg promise)))))
 
 (defn pipeline-initializer [pipeline-builder]
-  (channel-inbound-handler
-
-    :channel-registered
-    ([this ctx]
-      (let [pipeline (.pipeline ctx)]
-        (try
-          (.remove pipeline this)
-          (pipeline-builder pipeline)
-          (.fireChannelRegistered ctx)
-          (catch Throwable e
-            (log/warn e "Failed to initialize channel")
-            (.close ctx)))))))
+  (proxy [ChannelInitializer] []
+    (initChannel [^Channel ch]
+      (pipeline-builder ^ChannelPipeline (.pipeline ch)))))
 
 (defn instrument!
   [stream]