dat-tcp 0.2.0 → 0.3.0

data/dat-tcp.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency("SystemTimer", ["~> 1.2"])
+
   gem.add_development_dependency('assert',        ['~> 1.0'])
   gem.add_development_dependency('assert-mocha',  ['~> 1.0'])
 end

data/lib/dat-tcp.rb

@@ -16,14 +16,17 @@ module DatTCP
 
     def initialize(config = nil)
       config = OpenStruct.new(config || {})
-      @backlog_size  = config.backlog_size  || 1024
-      @debug         = config.debug         || false
-      @min_workers   = config.min_workers   || 2
-      @max_workers   = config.max_workers   || 4
-      @ready_timeout = config.ready_timeout || 1
+      @backlog_size     = config.backlog_size     || 1024
+      @debug            = config.debug            || false
+      @min_workers      = config.min_workers      || 2
+      @max_workers      = config.max_workers      || 4
+      @ready_timeout    = config.ready_timeout    || 1
+      @shutdown_timeout = config.shutdown_timeout || 15
 
       @logger = DatTCP::Logger.new(@debug)
 
+      check_configuration
+
       @tcp_server       = nil
       @work_loop_thread = nil
       @worker_pool      = nil
@@ -193,7 +196,7 @@ module DatTCP
 
     def shutdown_worker_pool
       self.logger.info "Shutting down worker pool, letting it finish..."
-      @worker_pool.shutdown
+      @worker_pool.shutdown(@shutdown_timeout)
     end
 
     def close_connection
@@ -209,6 +212,14 @@ module DatTCP
       @work_loop_thread.join if @work_loop_thread
     end
 
+    def check_configuration
+      if @min_workers > @max_workers
+        self.logger.warn "The minimum number of workers (#{@min_workers}) " \
+                         "is greater than " \
+                         "the maximum number of workers (#{@max_workers})."
+      end
+    end
+
     def run_hook(method, *args)
       self.send(method, *args)
     end

data/lib/dat-tcp/version.rb

@@ -1,3 +1,3 @@
 module DatTCP
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/dat-tcp/worker_pool.rb

@@ -1,16 +1,20 @@
+require 'system_timer'
 require 'thread'
 
 require 'dat-tcp/logger'
 
 module DatTCP
 
+  TimeoutError = Class.new(RuntimeError)
+
   class WorkerPool
     attr_reader :logger, :spawned
 
     def initialize(min = 0, max = 1, debug = false, &serve_proc)
       @min_workers = min
       @max_workers = max
-      @logger      = DatTCP::Logger.new(debug)
+      @debug       = debug
+      @logger      = DatTCP::Logger.new(@debug)
       @serve_proc  = serve_proc
 
       @queue           = DatTCP::Queue.new
@@ -48,16 +52,23 @@ module DatTCP
     # down. If a worker is processing a connection, then it will be joined and
     # allowed to finish.
     # **NOTE** Any connections that are on the queue are not served.
-    def shutdown
-      @workers.each(&:shutdown)
-      @queue.shutdown
-
-      # use this pattern instead of `each` -- we don't want to call `join` on
-      # every worker (especially if they are shutting down on their own), we
-      # just want to make sure that any who haven't had a chance to finish
-      # get to (this is safe, otherwise you might get a dead thread in the
-      # `each`).
-      @workers.first.join until @workers.empty?
+    def shutdown(timeout)
+      begin
+        SystemTimer.timeout(timeout, DatTCP::TimeoutError) do
+          @workers.each(&:shutdown)
+          @queue.shutdown
+
+          # use this pattern instead of `each` -- we don't want to call `join` on
+          # every worker (especially if they are shutting down on their own), we
+          # just want to make sure that any who haven't had a chance to finish
+          # get to (this is safe, otherwise you might get a dead thread in the
+          # `each`).
+          @workers.first.join until @workers.empty?
+        end
+      rescue DatTCP::TimeoutError => exception
+        exception.message.replace "Timed out shutting down the server"
+        @debug ? raise(exception) : self.logger.error(exception.message)
+      end
     end
 
     # public, because workers need to call it for themselves

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dat-tcp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,11 +16,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-16 00:00:00 Z
+date: 2013-02-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  requirement: *id001
+  name: SystemTimer
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +45,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id001
+  requirement: *id002
   name: assert
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,7 +60,7 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id002
+  requirement: *id003
   name: assert-mocha
   type: :development
 description: A generic threaded TCP server API.  It is designed for use as a base for application servers.