simpler_workflow 0.1.7 → 0.1.8

data/bin/swf

@@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+# setup
+#
+  require 'fileutils'
+
+  script     = File.expand_path(__FILE__).gsub(%r|\breleases/\d+\b|, 'current')
+  script_dir = File.dirname(script)
+  rails_root = File.dirname(script_dir)
+
+  Dir.chdir(rails_root)
+
+  require File.join(rails_root, 'config', 'env.rb')
+
+  FileUtils.mkdir_p(File.join(rails_root, 'log', 'jobs'))
+  FileUtils.touch(File.join(rails_root, 'log', 'jobs', 'pid'))
+
+  %w(
+    BACKGROUND PIDFILE QUEUE VVERBOSE INTERVAL COUNT
+  ).each{|key| ENV.delete(key)}
+
+  quiet   = ARGV.delete('-q') || ARGV.delete('--quiet')
+  mode    = ARGV.shift || 'run'
+
+  pidfile = './log/jobs/pid'
+  pid     = Integer(IO.read(pidfile).strip) rescue nil
+  running = begin; Process.kill(0, pid); true; rescue Object; false; end
+
+# go
+#
+  case mode
+    when 'pid'
+      puts(pid) if running
+
+    when 'run'
+      exit(42) unless DATA.flock(File::LOCK_EX | File::LOCK_NB)
+
+      ENV['PIDFILE']  = pidfile
+      ENV['QUEUE']    = 'jobs'
+      ENV['VVERBOSE'] = '1'
+      exec "rake environment resque:work"
+
+    when 'start'
+      exit(42) unless DATA.flock(File::LOCK_EX | File::LOCK_NB)
+
+      unless running
+        FileUtils.rm_f(pidfile)
+
+        pid = nil
+        a, b = IO.pipe
+        if fork
+          b.close
+          pid = Integer(a.read.strip)
+          a.close
+          puts(pid) unless quiet
+          exit
+        end
+        exit!(0) if fork
+        a.close
+        b.puts(Process.pid)
+        b.close
+
+        {
+          'stdin' => STDIN,
+          'stdout' => STDOUT,
+          'stderr' => STDERR,
+        }.each do |basename, io|
+          path = File.join("log/jobs/#{ basename }")
+          begin
+            open(path, 'a+'){|fd| io.reopen(fd)}
+          rescue
+            open(path, 'w+'){|fd| io.reopen(fd)}
+          end
+        end
+
+        Process.setsid rescue nil
+        File.umask(0) rescue nil
+
+# This is where Resque is started...
+# Looks like a good place to load and run a task that launches a workflow...
+        ENV['PIDFILE']  = pidfile
+        ENV['QUEUE']    = 'jobs'
+        ENV['VVERBOSE'] = '1' if ENV['RAILS_ENV'] != 'production'
+        exec "rake environment resque:work"
+      end
+
+    when 'stop'
+      if running
+        begin
+          Process.kill('-QUIT', pid)
+        rescue Errno::ESRCH
+          nil
+        end
+      end
+
+    when 'shutdown'
+      if running
+        alive = true
+
+        %w( QUIT TERM ).each do |signal|
+          begin
+            Process.kill(signal, pid)
+          rescue Errno::ESRCH
+            nil
+          end
+
+          42.times do
+            begin
+              alive = Process.kill(0, pid)
+              sleep(1 + rand) if alive
+            rescue Errno::ESRCH
+              alive = false
+              break
+            end
+          end
+
+          break unless alive
+        end
+
+        if alive
+          begin
+            Process.kill(-9, pid)
+            sleep(rand)
+          rescue Errno::ESRCH
+            nil
+          end
+        end
+      end
+
+    when 'restart'
+      exit! if fork
+      exit! if fork
+      system "#{ script } shutdown -q >/dev/null 2>&1"
+      exec "#{ script } start -q >/dev/null 2>&1"
+
+    when 'tail'
+      exec "tail -F ./log/jobs/*"
+
+    when 'pstree'
+      exec "pstree #{ pid }" if running
+  end
+  
+__END__

data/lib/aws/simple_workflow/decision_task_additions.rb

@@ -3,11 +3,20 @@ require 'aws/simple_workflow/decision_task'
 module AWS
   class SimpleWorkflow
     module DecisionTaskAdditions
+      def self.extended(inst)
+        inst.class.__send__ :alias_method, :_original_events, :events
+      end
+
       def scheduled_event(event)
         events.to_a[event.attributes.scheduled_event_id - 1]
       end
+
+      def events
+        @__original_events ||= _original_events
+      end
+
     end
 
-    DecisionTask.__send__(:include, DecisionTaskAdditions)
   end
 end
+

data/lib/simpler_workflow/activity.rb

@@ -1,5 +1,7 @@
 module SimplerWorkflow
   class Activity
+    include OptionsAsMethods
+
     attr_reader :domain, :name, :version, :options, :next_activity
 
     def initialize(domain, name, version, options = {})
@@ -20,14 +22,6 @@ module SimplerWorkflow
       end
     end
 
-    def method_missing(meth_name, *args)
-      if @options.has_key?(meth_name.to_sym)
-        @options[meth_name.to_sym] = args[0]
-      else
-        super
-      end
-    end
-
     def on_success(activity, version = nil)
       case activity
       when Hash

data/lib/simpler_workflow/options_as_methods.rb

@@ -0,0 +1,11 @@
+module SimplerWorkflow
+  module OptionsAsMethods
+    def method_missing(meth_name, *args)
+      if @options.has_key?(meth_name.to_sym)
+        @options[meth_name.to_sym] = args[0]
+      else
+        super
+      end
+    end
+  end
+end

data/lib/simpler_workflow/version.rb

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

data/lib/simpler_workflow/workflow.rb

@@ -1,5 +1,7 @@
 module SimplerWorkflow
   class Workflow
+    include OptionsAsMethods
+
     attr_reader :task_list, :domain, :name, :version, :options, :initial_activity_type
 
     def initialize(domain, name, version, options = {})
@@ -29,7 +31,9 @@ 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|
-        logger.info("Received 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
@@ -43,6 +47,7 @@ module SimplerWorkflow
             activity_timed_out(decision_task, event)
           end
         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
@@ -141,14 +146,6 @@ module SimplerWorkflow
       workflows[[name, version]] = workflow
     end
 
-    def method_missing(meth_name, *args)
-      if @options.has_key?(meth_name.to_sym)
-        @options[meth_name.to_sym] = args[0]
-      else
-        super
-      end
-    end
-
     protected
     def self.workflows
       @workflows ||= {}

data/lib/simpler_workflow.rb

@@ -3,19 +3,26 @@ require 'aws/simple_workflow/decision_task_additions'
 require 'map'
 
 module SimplerWorkflow
-  def SimplerWorkflow.domain(domain_name)
+  extend self
+
+  def domain(domain_name)
     @domains ||= {}
     @domains[domain_name.to_sym] ||= Domain.new(domain_name)
   end
 
-  def SimplerWorkflow.swf
+  def swf
     @swf ||= ::AWS::SimpleWorkflow.new
   end
 
+  def logger
+    $logger || Rails.logger
+  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'
 end
 
 class Map

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simpler_workflow
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Frederic Jean
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: aws-sdk
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +29,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
+  name: aws-sdk
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: map
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: map
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rake
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +71,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rspec
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: travis-lint
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,13 +85,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: travis-lint
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 description: A wrapper around Amazon's Simple Workflow Service
 email: 
 - fred@snugghome.com
-executables: []
-
+executables: 
+- swf
 extensions: []
 
 extra_rdoc_files: []
@@ -106,11 +106,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/swf
 - ext/mkrf_conf.rb
 - lib/aws/simple_workflow/decision_task_additions.rb
 - lib/simpler_workflow.rb
 - lib/simpler_workflow/activity.rb
 - lib/simpler_workflow/domain.rb
+- lib/simpler_workflow/options_as_methods.rb
 - lib/simpler_workflow/version.rb
 - lib/simpler_workflow/workflow.rb
 - lib/simpler_workflow/workflow_collection.rb