simpler_workflow 0.1.8 → 0.1.9

data/lib/simpler_workflow.rb

@@ -18,11 +18,24 @@ module SimplerWorkflow
     $logger || Rails.logger
   end
 
+  def exception_reporter(&block)
+    if block_given?
+      @exception_reporter = DefaultExceptionReporter.new(&block)
+    end
+
+    @exception_reporter || DefaultExceptionReporter.new
+  end
+
+  def exception_reporter=(exception_handler)
+    @exception_reporter = exception_handler
+  end
+
   autoload :Version,  'simpler_workflow/version'
   autoload :Domain,   'simpler_workflow/domain'
   autoload :Workflow, 'simpler_workflow/workflow'
   autoload :Activity, 'simpler_workflow/activity'
   autoload :OptionsAsMethods, 'simpler_workflow/options_as_methods'
+  autoload :DefaultExceptionReporter, 'simpler_workflow/default_exception_reporter'
 end
 
 class Map

data/lib/simpler_workflow/activity.rb

@@ -52,8 +52,10 @@ module SimplerWorkflow
       logger.info("Performing task #{name}")
       @perform_task.call(task)
     rescue => e
-      logger.error e.message
-      logger.error e.backtrace.join("\n")
+      context = to_activity_type
+      context[:input] = task.input
+      context[:activity_id] = task.activity_id
+      SimplerWorkflow.exception_reporter.report(e, context)
       task.fail! :reason => e.message[0..250], :details => {:failure_policy => failure_policy}.to_json
     end
 
@@ -80,8 +82,11 @@ module SimplerWorkflow
             end
           rescue Timeout::Error => e
           rescue => e
-            logger.error(e.message)
-            logger.error(e.backtrace.join("\n"))
+            context = to_activity_type
+            context[:input] = task.input
+            context[:activity_id] = task.activity_id
+            SimplerWorkflow.exception_reporter.report(e, context)
+            raise e
           end
         end
       end

data/lib/simpler_workflow/default_exception_reporter.rb

@@ -0,0 +1,26 @@
+# Default exception handler. Just logs to the logger and re-raise
+# so the exception can be managed as usual.
+
+module SimplerWorkflow
+  class DefaultExceptionReporter
+    attr_accessor :reporter, :tag
+
+    def initialize(&block)
+      @reporter = block if block_given?
+    end
+
+    def report(e, context = {})
+      if reporter
+        reporter.call(e, context)
+      else
+        SimplerWorkflow.logger.error("[#{tag}] Exception: #{e.message}")
+        SimplerWorkflow.logger.error("[#{tag}] Context: #{context.inspect}") unless context.empty?
+        SimplerWorkflow.logger.error("[#{tag}] Backtrace:\n#{e.backtrace.join("\n")}")
+      end
+    end
+
+    def tag
+      @tag || "SimplerWorkflow"
+    end
+  end
+end

data/lib/simpler_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimplerWorkflow
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/simpler_workflow/workflow.rb

@@ -31,23 +31,32 @@ module SimplerWorkflow
     def decision_loop
       logger.info("Starting decision loop for #{name.to_s}, #{version} listening to #{task_list}")
       domain.decision_tasks.poll(task_list) do |decision_task|
-        start_time = DateTime.now
-        logger.info("Received decision task #{decision_task.id} at #{start_time}")
-        decision_task.extend AWS::SimpleWorkflow::DecisionTaskAdditions
-        decision_task.new_events.each do |event|
-          logger.info("Processing #{event.event_type}")
-          case event.event_type
-          when 'WorkflowExecutionStarted'
-            start_execution(decision_task, event)
-          when 'ActivityTaskCompleted'
-            activity_completed(decision_task, event)
-          when 'ActivityTaskFailed'
-            activity_failed(decision_task, event)
-          when 'ActivityTaskTimedOut'
-            activity_timed_out(decision_task, event)
+        begin
+          start_time = DateTime.now
+          logger.info("Received decision task #{decision_task.id} at #{start_time}")
+          decision_task.extend AWS::SimpleWorkflow::DecisionTaskAdditions
+          decision_task.new_events.each do |event|
+            logger.info("Processing #{event.event_type}")
+            case event.event_type
+            when 'WorkflowExecutionStarted'
+              start_execution(decision_task, event)
+            when 'ActivityTaskCompleted'
+              activity_completed(decision_task, event)
+            when 'ActivityTaskFailed'
+              activity_failed(decision_task, event)
+            when 'ActivityTaskTimedOut'
+              activity_timed_out(decision_task, event)
+            end
           end
+        rescue => e
+          context = {
+            :workflow_execution => decision_task.workflow_execution,
+            :workflow => to_workflow_type,
+            :decision_task => decision_task
+          }
+          SimplerWorkflow.exception_reporter.report(e, context)
+          raise e
         end
-        logger.info("Completed Processing Decision Task #{decision_task.id} in #{((DateTime.now - start_time) * 24 * 60 * 60).to_i} seconds.")
       end
     rescue Timeout::Error => e
       retry
@@ -117,6 +126,10 @@ module SimplerWorkflow
       end
     end
 
+    def to_workflow_type
+      { :name => name, :version => version }
+    end
+
     def start_workflow(input, options = {})
       options[:input] = input
       domain.workflow_types[name.to_s, version].start_execution(options)

metadata

@@ -1,104 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simpler_workflow
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.1.9
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Frederic Jean
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
-  name: aws-sdk
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
   name: map
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: travis-lint
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A wrapper around Amazon's Simple Workflow Service
-email: 
+email:
 - fred@snugghome.com
-executables: 
+executables:
 - swf
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -111,6 +111,7 @@ files:
 - lib/aws/simple_workflow/decision_task_additions.rb
 - lib/simpler_workflow.rb
 - lib/simpler_workflow/activity.rb
+- lib/simpler_workflow/default_exception_reporter.rb
 - lib/simpler_workflow/domain.rb
 - lib/simpler_workflow/options_as_methods.rb
 - lib/simpler_workflow/version.rb
@@ -122,38 +123,30 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/SnuggHome/simpler_workflow
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.20
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A wrapper and DSL around Amazon's Simple Workflow Service with the goal of making it almost pleasant to define workflows.
-test_files: 
+summary: A wrapper and DSL around Amazon's Simple Workflow Service with the goal of
+  making it almost pleasant to define workflows.
+test_files:
 - spec/domain_spec.rb
 - spec/simpler_workflow_spec.rb
 - spec/spec_helper.rb