stalker 0.4.0 → 0.4.1

data/README.md

@@ -67,6 +67,15 @@ In a production environment you may run one or more high-priority workers (limit
     $ for i in 1 2; do stalk jobs.rb email.send > log/urgent-worker.log 2>&1; end
     $ for i in 1 2 3 4; do stalk jobs.rb > log/worker.log 2>&1; end
 
+Error Handling
+-------------
+
+If you include an `error` block in your jobs definition, that block will be invoked when a worker encounters an error. You might use this to report errors to an external monitoring service:
+
+    error do |e|
+       Exceptional.handle(e)
+    end
+
 Tidbits
 -------
 
@@ -92,7 +101,7 @@ Meta
 
 Created by Adam Wiggins
 
-Patches from Jamie Cobbett and Scott Water
+Patches from Jamie Cobbett, Scott Water, Keith Rarick, Mark McGranaghan
 
 Heavily inspired by [Minion](http://github.com/orionz/minion) by Orion Henry
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/stalker.rb

@@ -20,6 +20,10 @@ module Stalker
 		@@handlers[j] = block
 	end
 
+	def error(&blk)
+		@@error_handler = blk
+	end
+
 	class NoJobsDefined < RuntimeError; end
 	class NoSuchJob < RuntimeError; end
 
@@ -62,15 +66,16 @@ module Stalker
 	rescue SystemExit
 		raise
 	rescue => e
-		STDERR.puts exception_message(e)
+		log_error exception_message(e)
 		job.bury rescue nil
 		log_job_end(name, 'failed')
+		error_handler.call(e) if error_handler
 	end
 
 	def failed_connection(e)
-		STDERR.puts exception_message(e)
-		STDERR.puts "*** Failed connection to #{beanstalk_url}"
-		STDERR.puts "*** Check that beanstalkd is running (or set a different BEANSTALK_URL)"
+		log_error exception_message(e)
+		log_error "*** Failed connection to #{beanstalk_url}"
+		log_error "*** Check that beanstalkd is running (or set a different BEANSTALK_URL)"
 		exit 1
 	end
 
@@ -97,6 +102,10 @@ module Stalker
 		puts "[#{Time.now}] #{msg}"
 	end
 
+	def log_error(msg)
+		STDERR.puts msg
+	end
+
 	def beanstalk
 		@@beanstalk ||= Beanstalk::Pool.new([ beanstalk_host_and_port ])
 	end
@@ -128,7 +137,12 @@ module Stalker
 		@@handlers.keys
 	end
 
+	def error_handler
+		@@error_handler
+	end
+
 	def clear!
 		@@handlers = nil
+		@@error_handler = nil
 	end
 end

data/test/stalker_test.rb

@@ -3,14 +3,15 @@ require 'contest'
 require 'mocha'
 
 module Stalker
-	def log(msg)
-	end
+	def log(msg); end
+	def log_error(msg); end
 end
 
 class StalkerTest < Test::Unit::TestCase
 	setup do
 		Stalker.clear!
 		$result = -1
+		$handled = false
 	end
 
 	test "enqueue and work a job" do
@@ -21,4 +22,21 @@ class StalkerTest < Test::Unit::TestCase
 		Stalker.work_one_job
 		assert_equal val, $result
 	end
+
+	test "invoke error handler when defined" do
+		Stalker.error { |e| $handled = true }
+		Stalker.job('my.job') { fail }
+		Stalker.enqueue('my.job')
+		Stalker.prep
+		Stalker.work_one_job
+		assert_equal true, $handled
+	end
+
+	test "continue working when error handler not defined" do
+		Stalker.job('my.job') { fail }
+		Stalker.enqueue('my.job')
+		Stalker.prep
+		Stalker.work_one_job
+		assert_equal false, $handled
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stalker
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-08-05 00:00:00 -07:00
 default_executable: stalk
 dependencies: 
 - !ruby/object:Gem::Dependency