juggler 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/examples/app.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'sinatra'
+
+get '/slow' do
+  sleep 3
+  return 'Finally done'
+end

data/examples/test_consumer.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'juggler'
+require 'eventmachine'
+
+Juggler.logger = Logger.new(STDOUT)
 
 EM.run {
   Juggler.juggle(:http, 3) do |path|
     http = EM::Protocols::HttpClient.request({
-      :host => "0.0.0.0",
-      :port => 3000,
+      :host => "localhost",
+      :port => 4567,
       :request => path
     })
     http.callback do |response|

data/examples/test_producer.rb

@@ -2,10 +2,19 @@ require 'rubygems'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'juggler'
 
+Juggler.logger = Logger.new(STDOUT)
+
 # Throw some jobs
 
-10.times do |i|
+class Foo; end
+
+2.times do |i|
   path = ['/fast', '/slow'][i % 2]
-  Juggler.throw(:http, path)
+  Juggler.throw(:http, path, {
+    :ttr => 1
+  })
 end
 10.times { Juggler.throw(:timer, {:foo => 'bar'}) }
+
+# Test that unmarshaling errors are handled
+Juggler.throw(:http, Foo.new)

data/lib/juggler.rb

@@ -22,7 +22,13 @@ class Juggler
     def throw(method, params, options = {})
       # TODO: Do some checking on the method
       connection.use(method.to_s)
-      connection.put(Marshal.dump(params))
+
+      priority = options[:priority] || 50
+      delay = 0
+      # Add 2s because we want to handle the timeout before beanstalk does
+      ttr = (options[:ttr] || 60) + 2
+
+      connection.put(Marshal.dump(params), priority, delay, ttr)
     end
 
     def juggle(method, concurrency = 1, &strategy)

data/lib/juggler/runner.rb

@@ -19,19 +19,46 @@ class Juggler
 
     def reserve
       beanstalk_job = connection.reserve(0)
-      params = Marshal.load(beanstalk_job.body)
-      job = @strategy.call(params)
+
+      begin
+        params = Marshal.load(beanstalk_job.body)
+      rescue => e
+        handle_exception(e, "Exception unmarshaling #{@queue} job")
+        beanstalk_job.delete
+        return
+      end
+
+      begin
+        job = @strategy.call(params)
+      rescue => e
+        handle_exception(e, "Exception calling #{@queue} strategy")
+        beanstalk_job.decay
+        return
+      end
+
+      EM::Timer.new(beanstalk_job.ttr - 2) do
+        job.fail(:timeout)
+      end
+
       @running << job
       job.callback do
         @running.delete(job)
         beanstalk_job.delete
       end
-      job.errback do
+      job.errback do |error|
+        Juggler.logger.info("#{@queue} job failed: #{error}")
         @running.delete(job)
         # Built in exponential backoff
         beanstalk_job.decay
       end
     rescue Beanstalk::TimedOut
+    rescue Beanstalk::NotConnected
+      Juggler.logger.fatal "Could not connect any beanstalk hosts. " \
+        "Retrying in 1s."
+      sleep 1
+    rescue => e
+      handle_exception(e, "Unhandled exception")
+      beanstalk_job.delete if beanstalk_job
     end
 
     def run
@@ -47,6 +74,11 @@ class Juggler
       @running.size < @concurrency
     end
 
+    def handle_exception(e, message)
+      Juggler.logger.error "#{message}: #{e.class} #{e.message}"
+      Juggler.logger.debug e.backtrace.join("\n")
+    end
+
     def connection
       @pool ||= begin
         pool = Beanstalk::Pool.new(Juggler.hosts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juggler
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -66,5 +66,6 @@ test_files:
 - spec/juggler_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
+- examples/app.rb
 - examples/test_consumer.rb
 - examples/test_producer.rb