ntswf 2.0.3 → 2.0.4

data/lib/ntswf/activity_worker.rb

@@ -39,22 +39,29 @@ module Ntswf
       announce("polling for activity task #{activity_task_list}")
       domain.activity_tasks.poll_for_single_task(activity_task_list) do |activity_task|
         announce("got activity task #{activity_task.activity_type.inspect} #{activity_task.input}")
-        begin
-          returned_hash = @task_callback.call(describe(activity_task)) if @task_callback
-          process_returned_hash(activity_task, returned_hash)
-        rescue => e
-          notify(e, activity_type: activity_task.activity_type.inspect, input: activity_task.input)
-          details = {
-            error: e.message[0, 1000],
-            exception: e.class.to_s[0, 1000],
-          }
-          activity_task.fail!(details: details.to_json, reason: 'Exception')
-        end
+        process_single_task activity_task
       end
     end
 
     protected
 
+    def process_single_task(activity_task)
+      returned_hash = @task_callback.call(describe(activity_task)) if @task_callback
+      process_returned_hash(activity_task, returned_hash)
+    rescue => exception
+      fail_with_exception(activity_task, exception)
+    end
+
+    def fail_with_exception(activity_task, exception)
+      notify(exception, activity_type: activity_task.activity_type.inspect,
+          input: activity_task.input)
+      details = {
+        error: exception.message[0, 1000],
+        exception: exception.class.to_s[0, 1000],
+      }
+      activity_task.fail!(details: details.to_json, reason: 'Exception')
+    end
+
     def describe(activity_task)
       options = parse_input(activity_task.input)
       options.merge!(

data/lib/ntswf/base.rb

@@ -1,5 +1,6 @@
 require 'aws'
 require 'ostruct'
+require 'securerandom'
 
 module Ntswf
   module Base
@@ -16,10 +17,14 @@ module Ntswf
     #   overwritten by another process. See {Worker#in_subprocess}
     # @option config [Numeric] :subprocess_retries (0) see {Worker#in_subprocess}
     # @option config [String] :secret_access_key AWS credential
+    # @option config [String] :task_list_suffix_file
+    #   Development option.
+    #   A random ID is stored at the given path, and appended to all task list names.
     # @option config [String] :unit This worker/client's activity task list key
     # @raise If a task list name is invalid
     def configure(config)
       @config = OpenStruct.new(config)
+      autocomplete_task_list_names!
       raise_if_invalid_task_list
     end
 
@@ -122,5 +127,26 @@ module Ntswf
         end
       end
     end
+
+    def autocomplete_task_list_names!
+      @config.decision_task_list = autocomplete(@config.decision_task_list, "master-dtl")
+      if @config.activity_task_lists
+        @config.activity_task_lists.each do |key, value|
+          @config.activity_task_lists[key] = autocomplete(value, "#{key}-atl")
+        end
+      end
+    end
+
+    def autocomplete(value, fallback)
+      value = fallback unless value.kind_of? String
+      "#{value}#{task_list_suffix}"
+    end
+
+    def task_list_suffix
+      file = @config.task_list_suffix_file
+      return "" unless file
+      File.write(file, SecureRandom.hex(9)) unless File.exist?(file)
+      @suffix ||= File.read(file)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntswf
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk