sqsrun 0.5.0 → 0.6.0

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-07-19 version 0.6.0
+
+* Changed not to set visibility_timeout=0 when a task is failed
+* Added -E, --release-on-fail option
+
+
 == 2011-07-18 version 0.5.0
 
 * Added respectable timeout implementation

data/lib/sqsrun/command/sqsrun.rb

@@ -15,6 +15,7 @@ defaults = {
   :timeout => 30,
   :interval => 1,
   :kill_retry => 60,
+  :release_on_fail => false,
 }
 
 conf = { }
@@ -77,7 +78,7 @@ op.on('-e', '--extend-timeout SEC', 'Threashold time before extending visibility
   conf[:extend_timeout] = i
 }
 
-op.on('-x', '--kill-timeout SEC', 'Threashold time before killing process (default: timeout * 5)', Integer) {|i|
+op.on('-x', '--kill-timeout SEC', 'Threashold time before killing process (default: timeout * 10)', Integer) {|i|
   conf[:kill_timeout] = i
 }
 
@@ -89,6 +90,10 @@ 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|
+  conf[:release_on_fail] = b
+}
+
 op.on('-d', '--daemon PIDFILE', 'Daemonize (default: foreground)') {|s|
   conf[:daemon] = s
 }
@@ -159,7 +164,7 @@ begin
   end
 
   unless conf[:kill_timeout]
-    conf[:kill_timeout] = conf[:timeout] * 5
+    conf[:kill_timeout] = conf[:timeout] * 10
   end
 
   if !conf[:queue] && (type != :list && type != :conf)

data/lib/sqsrun/version.rb

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

data/lib/sqsrun/worker.rb

@@ -14,6 +14,7 @@ class Worker
     @kill_timeout = conf[:kill_timeout]
     @kill_retry = conf[:kill_retry]
     @interval = conf[:interval]
+    @release_on_fail = conf[:release_on_fail]
     @finished = false
 
     @extender = TimerThread.new(@visibility_timeout, @extend_timeout, @kill_timeout, @kill_retry)
@@ -78,13 +79,13 @@ class Worker
 
   def process(msg)
     puts "started id=#{msg.id}"
-    thread = Thread.new(msg.to_s, &@run_proc.method(:call))
 
     @extender.set_message(msg)
 
     success = false
     begin
-      thread.join
+      @run_proc.call(msg.to_s)
+      puts "finished id=#{msg.id}"
       success = true
     rescue
       puts "failed id=#{msg.id}: #{$!}"
@@ -98,7 +99,9 @@ class Worker
     if success
       msg.delete
     else
-      msg.visibility = 0
+      if @release_on_fail
+        msg.visibility = 0
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqsrun
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sadayuki Furuhashi