jflow 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a39c9fd14f64b6c067143fae05df488e5ebf146e
-  data.tar.gz: 3b3e9cf16d297f884d84a23e51bc7a50f1b4851a
+  metadata.gz: 308f589a87738e9ab38d7a714ade494978ae753e
+  data.tar.gz: 7b4769dcd0ffe32e4faa9983f23cb8a0efe693ff
 SHA512:
-  metadata.gz: dccbe5e1dfefa8ef5cfd8880675576ebaff524422bd443f78b8381cf1b435c0496fbeea1e44983ed61fa082018a6e204ea82ddb2263f766a5e49a41ba1fc6308
-  data.tar.gz: 03a10a4ef3012ed02c8e5912e4a7de4c083393319dcd8881989a95ba5b306f72bed98c7523da599cb502319193c179bcc0eb5388c08e1b0c3c5a3ec8dc954292
+  metadata.gz: e0223780c90d2a666ab88fa98663ee704031d09ffe8c55e9f1a56206f6763c5d583e984b8d5da1384b7e04fdcef3a37dcaaad823402a928d16aab3889b444392
+  data.tar.gz: 83afde68c71aca64663dd9dd5d2e769b50465a44cdd55ea099f3579d705a3959d0ba9b0cdc9a98af653c2c1d117328d55583de0131b92f3f842152d7534740b4

data/bin/jflow_worker

@@ -38,6 +38,31 @@ configuration["number_of_workers"].times do |i|
   end
 end
 
-threads.each { |thr| thr.join }
+def shutdown(threads)
+  JFlow.configuration.logger.info "Sending kill signal to running threads. Please wait for current polling to finish"
+  kill_threads = []
+  threads.each do |thread|
+    thread["do_exit"] = true
+    if thread["state"] == :working
+      kill_threads << Thread.new do
+        sleep 60
+        if thread.alive?
+          thread.raise("Workers are going down!")
+        end
+      end
+    end
+  end
+  kill_threads.each { |thr| thr.join }
+end
+
+Signal.trap("INT") {
+  shutdown(threads)
+}
+
+# Trap `Kill `
+Signal.trap("TERM") {
+  shutdown(threads)
+}
 
+threads.each { |thr| thr.join }
 

data/lib/jflow/activity/task.rb

@@ -40,6 +40,7 @@ module JFlow
 
       def run!
         log "Started #{klass}##{method} with #{input}"
+
         result = klass.new.send(method, *input) || "done"
         log "Result is #{result.class} #{result}"
         completed!(result)
@@ -57,7 +58,7 @@ module JFlow
         swf_client.respond_activity_task_failed({
           task_token: token,
           reason: exception.message,
-          details: exception.backtrace.join("\n"),
+          details: exception.backtrace ? exception.backtrace.join("\n") : "no stacktrace",
         })
       end
 

data/lib/jflow/activity/worker.rb

@@ -10,33 +10,43 @@ module JFlow
       end
 
       def start!
-        loop do
+        while should_be_working?
           log "Polling for task on #{domain} - #{tasklist}"
           poll
         end
+        log "Thread is marked as exiting, stopping the poll"
       end
 
-      private
 
       def poll
+        Thread.current["state"] = :polling
         response = JFlow.configuration.swf_client.poll_for_activity_task(poll_params)
         if response.task_token
-          process_task(response)
+          log "Got task #{response.task_token}"
+          task = JFlow::Activity::Task.new(response)
+          if should_be_working?
+            process(task)
+          else
+            #The worker is shuting down, we don't want to start working on anything
+            #so we fail the task and let the decider queue it up for retry later
+            task.failed!(Exception.new("Worker is going down!"))
+          end
         else
           log "Got no task"
         end
       end
 
-      def process_task(response)
-        log "Got task #{response.task_token}"
-        task = JFlow::Activity::Task.new(response)
+      def process(task)
         begin
+          Thread.current["state"] = :working
           task.run!
         rescue => exception
           task.failed!(exception)
         end
       end
 
+      private
+
       def identity
         @identity ||= "#{`hostname`.chomp}-#{Thread.current.object_id}"
       end
@@ -55,6 +65,10 @@ module JFlow
         }
       end
 
+      def should_be_working?
+        Thread.current["do_exit"] != true
+      end
+
     end
   end
 end

data/lib/jflow/version.rb

@@ -1,3 +1,3 @@
 module JFlow
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: jflow
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Christophe Verbinnen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: aws-sdk
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: hash_validator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   prerelease: false
@@ -56,12 +56,12 @@ dependencies:
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   prerelease: false
@@ -70,12 +70,12 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   prerelease: false
@@ -84,12 +84,12 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -98,12 +98,12 @@ dependencies:
   name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -118,9 +118,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -146,17 +146,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: SWF Flow framework for jRuby