quebert 1.0.0 → 1.0.1

data/lib/quebert/version.rb

@@ -1,3 +1,3 @@
 module Quebert
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/quebert/worker.rb

@@ -10,18 +10,33 @@ module Quebert
     
     # Start the worker backend and intercept exceptions if a handler is provided
     def start
-      Signal.trap('TERM'){ stop }
-      
+      Signal.trap('TERM') { safe_stop }
+      Signal.trap('INT') { safe_stop }
+
       logger.info "Worker started with #{backend.class.name} backend\n"
-      while controller = backend.reserve do
+      while @controller = backend.reserve do      
         begin
-          controller.perform
+          @controller.perform
         rescue Exception => e
           exception_handler ? exception_handler.call(e) : raise(e)
-        end
+        end        
+        @controller = nil
+
+        stop if @terminate_sent
       end
     end
     
+    def safe_stop
+      if @terminate_sent
+        logger.info "Ok! I get the point. Shutting down immediately."
+        stop
+      else
+        logger.info "Finishing current job then shutting down."
+        @terminate_sent = true
+        stop unless @controller
+      end
+    end
+
     def stop
       logger.info "Worker stopping\n"
       exit 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quebert
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brad Gessler
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 -08:00
+date: 2012-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency