dat-tcp 0.6.0 → 0.7.0

data/dat-tcp.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("dat-worker-pool", ["~> 0.4"])
+  gem.add_dependency("dat-worker-pool", ["~> 0.5"])
 
-  gem.add_development_dependency('assert', ['~> 2.12'])
+  gem.add_development_dependency('assert', ['~> 2.15'])
 end

data/lib/dat-tcp.rb

@@ -9,6 +9,8 @@ module DatTCP
 
   class Server
 
+    attr_reader :worker_start_procs, :worker_shutdown_procs
+    attr_reader :worker_sleep_procs, :worker_wakeup_procs
     attr_reader :logger
     private :logger
 
@@ -22,6 +24,11 @@ module DatTCP
       @signal_reader, @signal_writer = IO.pipe
       @serve_proc = serve_proc || raise(ArgumentError, "no block given")
 
+      @worker_start_procs    = []
+      @worker_shutdown_procs = []
+      @worker_sleep_procs    = []
+      @worker_wakeup_procs   = []
+
       @logger = DatTCP::Logger.new(@debug)
 
       @tcp_server       = nil
@@ -31,7 +38,7 @@ module DatTCP
     end
 
     def ip
-      @tcp_server.addr[2] if self.listening?
+      @tcp_server.addr[3] if self.listening?
     end
 
     def port
@@ -88,6 +95,11 @@ module DatTCP
       wait_for_shutdown if wait
     end
 
+    def on_worker_start(&block);    @worker_start_procs << block;    end
+    def on_worker_shutdown(&block); @worker_shutdown_procs << block; end
+    def on_worker_sleep(&block);    @worker_sleep_procs << block;    end
+    def on_worker_wakeup(&block);   @worker_wakeup_procs << block;   end
+
     def inspect
       reference = '0x0%x' % (self.object_id << 1)
       "#<#{self.class}:#{reference}".tap do |s|
@@ -107,9 +119,7 @@ module DatTCP
 
     def work_loop(client_file_descriptors = nil)
       logger.info "Starting work loop..."
-      @worker_pool = DatWorkerPool.new(@min_workers, @max_workers) do |socket|
-        serve(socket)
-      end
+      @worker_pool = build_worker_pool
       add_client_sockets_from_fds client_file_descriptors
       @worker_pool.start
       process_inputs while @signal.start?
@@ -128,6 +138,29 @@ module DatTCP
       logger.info "Stopped work loop"
     end
 
+    def build_worker_pool
+      wp = DatWorkerPool.new(
+        @min_workers,
+        @max_workers
+      ){ |socket| serve(socket) }
+
+      # add any configured callbacks
+      self.worker_start_procs.each do |cb|
+        wp.on_worker_start(&cb)
+      end
+      self.worker_shutdown_procs.each do |cb|
+        wp.on_worker_shutdown(&cb)
+      end
+      self.worker_sleep_procs.each do |cb|
+        wp.on_worker_sleep(&cb)
+      end
+      self.worker_wakeup_procs.each do |cb|
+        wp.on_worker_wakeup(&cb)
+      end
+
+      wp
+    end
+
     def add_client_sockets_from_fds(file_descriptors)
       (file_descriptors || []).each do |file_descriptor|
         @worker_pool.add_work TCPSocket.for_fd(file_descriptor)

data/lib/dat-tcp/server_spy.rb

@@ -7,6 +7,8 @@ module DatTCP
     attr_reader :ip, :port, :file_descriptor
     attr_reader :client_file_descriptors
     attr_reader :logger
+    attr_reader :worker_start_procs, :worker_shutdown_procs
+    attr_reader :worker_sleep_procs, :worker_wakeup_procs
     attr_reader :waiting_for_pause, :waiting_for_stop, :waiting_for_halt
     attr_accessor :listen_called, :start_called
     attr_accessor :stop_listen_called, :pause_called
@@ -21,9 +23,14 @@ module DatTCP
       @client_file_descriptors = []
       @logger = DatTCP::Logger::Null.new
 
+      @worker_start_procs    = []
+      @worker_shutdown_procs = []
+      @worker_sleep_procs    = []
+      @worker_wakeup_procs   = []
+
       @waiting_for_pause = nil
       @waiting_for_stop = nil
-      @waiting_for_hale = nil
+      @waiting_for_halt = nil
 
       @listen_called = false
       @stop_listen_called = false
@@ -77,6 +84,11 @@ module DatTCP
       @halt_called = true
     end
 
+    def on_worker_start(&block);    @worker_start_procs << block;    end
+    def on_worker_shutdown(&block); @worker_shutdown_procs << block; end
+    def on_worker_sleep(&block);    @worker_sleep_procs << block;    end
+    def on_worker_wakeup(&block);   @worker_wakeup_procs << block;   end
+
   end
 
 end

data/lib/dat-tcp/version.rb

@@ -1,3 +1,3 @@
 module DatTCP
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dat-tcp
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-30 00:00:00 Z
+date: 2015-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,14 +24,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        - 4
-        version: "0.4"
-  version_requirements: *id001
+        - 5
+        version: "0.5"
   type: :runtime
   name: dat-worker-pool
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -39,14 +39,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 2
-        - 12
-        version: "2.12"
-  version_requirements: *id002
+        - 15
+        version: "2.15"
   type: :development
   name: assert
+  version_requirements: *id002
   prerelease: false
 description: A generic threaded TCP server API.  It is designed for use as a base for application servers.
 email: 
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A generic threaded TCP server API