pastry 0.3.1 → 0.3.2

data/lib/pastry.rb

@@ -65,6 +65,8 @@ class Pastry
 
   private
 
+  GRACE = 60
+
   attr_accessor :pids
 
   def do_sanity_checks
@@ -200,10 +202,10 @@ class Pastry
     Process.detach(pid)
 
     begin
-      Timeout.timeout(timeout) { sleep 0.5 until File.exists?(pidfile) }
+      Timeout.timeout(GRACE) { sleep 0.5 until File.exists?(pidfile) }
     rescue Timeout::Error => e
       Process.kill('TERM', pid) rescue nil
-      logger.error "new master failed to spawn within #{timeout} secs, check logs"
+      logger.error "new master failed to spawn within #{GRACE} secs, check logs"
       @running = true
       FileUtils.mv "#{pidfile}.old", pidfile
     else
@@ -220,9 +222,9 @@ class Pastry
     pids.each {|pid| Process.kill(signal, pid) rescue nil}
     return if signal == 'KILL'
 
-    logger.info "waiting up to #{timeout} seconds"
+    logger.info "waiting up to #{GRACE} seconds"
     begin
-      Timeout.timeout(timeout) do
+      Timeout.timeout(GRACE) do
         alive = pids
         until alive.empty?
           sleep 0.1
@@ -243,7 +245,7 @@ class Pastry
       $0 = "#{name ? "%s worker" % name : "pastry chef"} #{worker} (started: #{Time.now})"
       EM.epoll
       EM.set_descriptor_table_size(max_connections)
-      EM.run { Backend.new.start(server) }
+      EM.run { Backend.new(timeout: timeout).start(server) }
     end
   end
 
@@ -252,6 +254,11 @@ class Pastry
   end
 
   class Backend < Thin::Backends::Base
+    def initialize options = {}
+      super()
+      @timeout = options.fetch(:timeout, 30)
+    end
+
     def start server
       @stopping = false
       @running  = true
@@ -261,6 +268,11 @@ class Pastry
       @signature = EM.attach_server_socket(server, Thin::Connection, &method(:initialize_connection))
     end
 
+    def initialize_connection connection
+      super
+      connection.comm_inactivity_timeout = @timeout
+    end
+
     def trap_signals!
       # ignore SIGCHLD, can be overriden by app.
       Signal.trap('CHLD', 'IGNORE')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pastry
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -4338099220466715262
+      hash: 1587036579679501269
       version: '0'
       segments:
       - 0