jflow 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee227c0d6cfc06d17a93805bd3c108bef4efe51b
-  data.tar.gz: e5e0046572c7b25d71bab9e654bc926433739265
+  metadata.gz: e2276ad3d9c8655f255cfa1e30aefbc9fa7c600a
+  data.tar.gz: 1cd72da5e78de2baaa6b59d7f94e769210218956
 SHA512:
-  metadata.gz: 4e5a5a9df63c946880805d2c67815638d9806956e3df6a6c5640a2d1f40d79a0cc6021b9dad4a46f366824b81cfb612046b04d9e2b126b21561ea2cf67468804
-  data.tar.gz: 365419b044cc4844505b516d442af18ee4565d34b42f79edb6b7e2c2582eca8ae1c8e735a51c43e9a23fc10f127981169bdad5d9624075a55b36c7c4ae078f60
+  metadata.gz: 07c8bb0d5c19255d9ffefe88408437f4c3d6ed5eef9d8071d3f637caf12f0eb72a6432a9d37d53600b4aaff6fdd4d6b0296ee30a9cced1cd71e8be9f9a6ca47f
+  data.tar.gz: 0af8e2edad69d05aec7772a9d52bdd6f294ea2731976d5e9c0ce02abfc778d1bc838f75f5d52653666f5c1d736249aa40d838b7c335f73ea888f82ac28f0ee18

data/README.md

@@ -42,7 +42,8 @@ Class FooActivity
       default_task_schedule_to_start_timeout: "600",
       default_task_schedule_to_close_timeout: "600",
       default_task_start_to_close_timeout: "600",
-      default_task_heartbeat_timeout: "600"
+      default_task_heartbeat_timeout: "600",
+      exceptions_to_exclude: [PermanentError]
     }
   end
 

data/jflow.gemspec

@@ -6,8 +6,8 @@ require 'jflow/version'
 Gem::Specification.new do |spec|
   spec.name          = "jflow"
   spec.version       = JFlow::VERSION
-  spec.authors       = ["Christophe Verbinnen"]
-  spec.email         = ["christophe.verbinnen@lookout.com"]
+  spec.authors       = ["Christophe Verbinnen","Richard Vorp"]
+  spec.email         = ["christophe.verbinnen@lookout.com","richard.vorp@lookout.com"]
 
   spec.summary       = %q{SWF Flow framework for jRuby}
   spec.description   = %q{you know, for flow}
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "hash_validator", "~> 0.4"
+  spec.add_runtime_dependency "jflow_exceptions", "~> 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/jflow/activity/definition.rb

@@ -2,7 +2,11 @@ module JFlow
   module Activity
     class Definition
 
-      DEFAULT_OPTIONS = {}
+      DEFAULT_OPTIONS = {
+        :exceptions_to_exclude => []
+      }
+
+      REGISTRATION_OPTIONS = [:version, :domain, :name, :default_task_list]
 
       OPTIONS_VALIDATOR = {
         :version => "string",
@@ -10,7 +14,8 @@ module JFlow
         :name    => "string",
         :default_task_list => {
           :name => "string"
-        }
+        },
+        :exceptions_to_exclude => 'array'
       }
 
       attr_reader :options, :klass
@@ -38,7 +43,7 @@ module JFlow
       end
 
       def register_activity
-        JFlow.configuration.swf_client.register_activity_type(options)
+        JFlow.configuration.swf_client.register_activity_type(registration_options)
         JFlow.configuration.logger.info "Activity #{name} was registered successfuly"
       end
 
@@ -77,6 +82,12 @@ module JFlow
 
       private
 
+      def registration_options
+        REGISTRATION_OPTIONS.each_with_object({}) do |key, hash|
+          hash[key] = @options[key]
+        end
+      end
+
       def validate_activity!
         validator = HashValidator.validate(@options, OPTIONS_VALIDATOR)
         raise "Activity #{options[:name]}definition is invalid! #{validator.errors}" unless validator.valid?
@@ -84,4 +95,4 @@ module JFlow
 
     end
   end
-end
+end

data/lib/jflow/activity/map.rb

@@ -16,6 +16,11 @@ module JFlow
         @map[name][version][:class]
       end
 
+      def options_for(name, version)
+        return nil if !@map.has_key?(name) || !@map[name][version]
+        @map[name][version][:options]
+      end
+
     end
   end
-end
+end

data/lib/jflow/activity/task.rb

@@ -43,6 +43,12 @@ module JFlow
         @klass_value
       end
 
+      def definition_options
+        @definition_options ||= JFlow.configuration.activity_map.options_for(name,version)
+        raise "Could not find activity definition for #{name}, #{version}" unless @definition_options
+        @definition_options
+      end
+
       def method
         if name.split('.').size > 1
           method = name.split('.').last
@@ -67,26 +73,30 @@ module JFlow
         })
       end
 
-
       def failed!(exception)
         log "Task Failed #{exception.message}"
 
         reason = truncate(exception.message, MAX_REASON_SIZE)
-        details = if exception.backtrace
-                    truncate(exception.backtrace.join("\n"), MAX_DETAILS_SIZE)
-                  else
-                    "no stacktrace"
-                  end
+
+        if retryable?(exception)
+          converted_exception = JFlow::Exceptions::Common.new(exception)
+        else
+          converted_exception = JFlow::Exceptions::Fatal.new(exception)
+        end
 
         swf_client.respond_activity_task_failed(
           task_token: token,
           reason: reason,
-          details: details
+          details: truncate(YAML.dump_stream(converted_exception, exception.backtrace), MAX_DETAILS_SIZE)
         )
       end
 
       private
 
+      def retryable?(exception)
+        !definition_options[:exceptions_to_exclude].include?(exception.class)
+      end
+
       def truncate(message, max_length)
         return message unless message.length > max_length
 

data/lib/jflow/version.rb

@@ -1,3 +1,3 @@
 module JFlow
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/jflow.rb

@@ -3,6 +3,7 @@ require "json"
 require "hash_validator"
 require 'aws-sdk'
 require 'logger'
+require 'jflow_exceptions'
 require "jflow/version"
 require "jflow/configuration.rb"
 require "jflow/domain.rb"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jflow
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Christophe Verbinnen
+- Richard Vorp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -38,6 +39,20 @@ dependencies:
         version: '0.4'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jflow_exceptions
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,6 +112,7 @@ dependencies:
 description: you know, for flow
 email:
 - christophe.verbinnen@lookout.com
+- richard.vorp@lookout.com
 executables:
 - console
 - jflow_worker