foxbat 0.2.3 → 0.2.4

data/lib/em/connection.rb

@@ -43,5 +43,9 @@ module EventMachine
       @netty_handler.peername
     end
 
+    def comm_inactivity_timeout=(seconds)
+      # todo
+    end
+
   end
 end

data/lib/eventmachine.rb

@@ -18,6 +18,7 @@ module EventMachine
   def self.kqueue; end
 
   def self.run(blk=nil, tail=nil, &block)
+    @alive = true
     @@threadpool = Executors.newCachedThreadPool
 
     block.call
@@ -27,12 +28,16 @@ module EventMachine
 
   def self.stop
     @@servers.each { |s| s.stop }
-    @@threadpool.shutdownNow
+    @@threadpool.shutdown
   end
 
   def self.executor
     @@threadpool
   end
 
+  def self.reactor_running?
+    @alive
+  end
+
 end
 

data/lib/foxbat/netty_connection.rb

@@ -6,8 +6,9 @@ module Foxbat
 
   class NettyConnection < SimpleChannelUpstreamHandler
 
-    def initialize(connection)
+    def initialize(connection, group)
       @connection = connection
+      @group = group
       connection.netty_handler = self
       super()
     end
@@ -23,6 +24,10 @@ module Foxbat
     end
 
     private
+
+    def channelOpen(ctx, e)
+      @group.add(e.getChannel)
+    end
     
     def channelConnected(ctx, e)
       @pipeline = ctx.getPipeline

data/lib/foxbat/pipeline.rb

@@ -10,9 +10,10 @@ module Foxbat
   class Pipeline
     include ChannelPipelineFactory
 
-    def initialize(handler, options={}, ssl_context=nil, &block)
+    def initialize(handler, group, options={}, ssl_context=nil, &block)
       @options = options
       @handler = handler
+      @group = group
       @block = block
       @context = ssl_context
     end
@@ -25,11 +26,14 @@ module Foxbat
       end
       h = @handler.new(@options)
       @block.call(h) if @block
-      connection = NettyConnection.new(h)
+      connection = NettyConnection.new(h, @group)
       pipeline.addLast("handler", connection)
       pipeline
     end
-    
+
+    def releaseExternalResources
+      p 'cleaning up factory...'
+    end
   end
 
 end

data/lib/foxbat/server.rb

@@ -1,4 +1,5 @@
 import java.net.InetSocketAddress
+import org.jboss.netty.channel.group.DefaultChannelGroup
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory
 import org.jboss.netty.bootstrap.ServerBootstrap
 require_relative 'pipeline'
@@ -12,20 +13,22 @@ module Foxbat
       if options[:secure]
         @context = Security.setup_ssl_context(options[:keystore])
       end
-      
+
+      @group = DefaultChannelGroup.new
       @address = InetSocketAddress.new(host, port)
-      @pipeline = Pipeline.new(klass, options, @context, &block)
+      @pipeline = Pipeline.new(klass, @group, options, @context, &block)
     end
 
     def start(threadpool)
       @factory = NioServerSocketChannelFactory.new(threadpool, threadpool)
       @bootstrap = ServerBootstrap.new(@factory)
       @bootstrap.setPipelineFactory(@pipeline)
-      @bootstrap.bind(@address)
+      @server_channel = @bootstrap.bind(@address)
+      @group.add(@server_channel)
     end
 
     def stop
-      @bootstrap.releaseExternalResources
+      @group.close.awaitUninterruptibly
     end
   end
   

data/lib/foxbat/version.rb

@@ -1,3 +1,3 @@
 module Foxbat
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foxbat
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: