sqsrun 0.6.0 → 0.6.1

data/README.rdoc

@@ -28,10 +28,12 @@ A Generics Worker Executor Service for Amazon SQS. It polls SQS queue and run co
           --configure PATH.yaml        Write configuration file
           --exec COMMAND               Execute command
           --run SCRIPT.rb              Run method named 'run' defined in the script
+          --env K=V                    Set environment variable
       -e, --extend-timeout SEC         Threashold time before extending visibility timeout (default: timeout * 3/4)
-      -x, --kill-timeout SEC           Threashold time before killing process (default: timeout * 5)
+      -x, --kill-timeout SEC           Threashold time before killing process (default: timeout * 10)
       -X, --kill-retry SEC             Threashold time before retrying killing process (default: 60)
       -i, --interval SEC               Polling interval (default: 1)
+      -U, --release-on-fail            Releases lock if task failed so that other node can retry immediately
       -d, --daemon PIDFILE             Daemonize (default: foreground)
       -f, --file PATH.yaml             Read configuration file
 

data/lib/sqsrun/command/sqsrun.rb

@@ -74,6 +74,11 @@ op.on('--run SCRIPT.rb', 'Run method named \'run\' defined in the script') {|s|
   conf[:run] = s
 }
 
+op.on('--env K=V', 'Set environment variable') {|s|
+  k, v = s.split('=',2)
+  (conf[:env] ||= {})[k] = v
+}
+
 op.on('-e', '--extend-timeout SEC', 'Threashold time before extending visibility timeout (default: timeout * 3/4)', Integer) {|i|
   conf[:extend_timeout] = i
 }
@@ -90,7 +95,7 @@ op.on('-i', '--interval SEC', 'Polling interval (default: 1)', Integer) {|i|
   conf[:interval] = i
 }
 
-op.on('-E', '--release-on-fail', 'Releases lock if task failed so that other node can retry immediately', TrueClass) {|b|
+op.on('-U', '--release-on-fail', 'Releases lock if task failed so that other node can retry immediately', TrueClass) {|b|
   conf[:release_on_fail] = b
 }
 
@@ -99,7 +104,7 @@ op.on('-d', '--daemon PIDFILE', 'Daemonize (default: foreground)') {|s|
 }
 
 op.on('-f', '--file PATH.yaml', 'Read configuration file') {|s|
-  conf[:file] = s
+  (conf[:files] ||= []) << s
 }
 
 
@@ -125,11 +130,16 @@ begin
     usage nil
   end
 
-  if conf[:file]
+  if conf[:files]
     require 'yaml'
-    yaml = YAML.load File.read(conf[:file])
+    docs = ''
+    conf[:files].each {|file|
+      docs << File.read(file)
+    }
     y = {}
-    yaml.each_pair {|k,v| y[k.to_sym] = v }
+    YAML.load_documents(docs) {|yaml|
+      yaml.each_pair {|k,v| y[k.to_sym] = v }
+    }
 
     conf = defaults.merge(y).merge(conf)
 
@@ -179,7 +189,7 @@ end
 if confout
   require 'yaml'
 
-  conf.delete(:file)
+  conf.delete(:files)
   conf[:args] = ARGV
 
   y = {}

data/lib/sqsrun/version.rb

@@ -1,5 +1,5 @@
 module SQSRun
 
-VERSION = '0.6.0'
+VERSION = '0.6.1'
 
 end

data/lib/sqsrun/worker.rb

@@ -15,6 +15,7 @@ class Worker
     @kill_retry = conf[:kill_retry]
     @interval = conf[:interval]
     @release_on_fail = conf[:release_on_fail]
+    @env = conf[:env] || {}
     @finished = false
 
     @extender = TimerThread.new(@visibility_timeout, @extend_timeout, @kill_timeout, @kill_retry)
@@ -80,6 +81,10 @@ class Worker
   def process(msg)
     puts "started id=#{msg.id}"
 
+    @env.each_pair {|k,v|
+      ENV[k] = v
+    }
+
     @extender.set_message(msg)
 
     success = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqsrun
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +09:00
+date: 2011-07-23 00:00:00 +09:00
 default_executable: sqsrun
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Generic SQS Worker Executor Service
+summary: Generic Worker Executor Service for Amazon SQS
 test_files: 
 - test/exec_test.rb
 - test/test_helper.rb