stalker 0.4.2 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/lib/stalker.rb

@@ -1,6 +1,7 @@
 require 'beanstalk-client'
 require 'json'
 require 'uri'
+require 'timeout'
 
 module Stalker
 	extend self
@@ -53,13 +54,23 @@ module Stalker
 		loop { work_one_job }
 	end
 
+	class JobTimeout < RuntimeError; end
+
 	def work_one_job
 		job = beanstalk.reserve
 		name, args = JSON.parse job.body
 		log_job_begin(name, args)
 		handler = @@handlers[name]
 		raise(NoSuchJob, name) unless handler
-		handler.call(args)
+
+		begin
+			Timeout::timeout(job.ttr - 1) do
+				handler.call(args)
+			end
+		rescue Timeout::Error
+			raise JobTimeout, "#{name} hit #{job.ttr-1}s timeout"
+		end
+
 		job.delete
 		log_job_end(name)
 	rescue Beanstalk::NotConnected => e

data/test/stalker_test.rb

@@ -39,4 +39,13 @@ class StalkerTest < Test::Unit::TestCase
 		Stalker.work_one_job
 		assert_equal false, $handled
 	end
+
+	test "exception raised one second before beanstalk ttr reached" do
+		Stalker.error { |e| $handled = e.class }
+		Stalker.job('my.job') { sleep(3); $handled = "didn't time out" }
+		Stalker.enqueue('my.job', {}, :ttr => 2)
+		Stalker.prep
+		Stalker.work_one_job
+		assert_equal Stalker::JobTimeout, $handled
+	end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: stalk
 dependencies: 
 - !ruby/object:Gem::Dependency