Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/clockwork/event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def execute
@block.call(@job, @last)
rescue => e
@manager.log_error e
@manager.handle_error e
@manager.handle_error e, self
end

def elapsed_ready?(t)
Expand Down
4 changes: 2 additions & 2 deletions lib/clockwork/manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ def log_error(e)
config[:logger].error(e)
end

def handle_error(e)
error_handler.call(e) if error_handler
def handle_error(e, event)
error_handler.call(e, event) if error_handler
end

def log(msg)
Expand Down
9 changes: 8 additions & 1 deletion test/manager_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,10 @@ def assert_wont_run(t)
describe 'error_handler' do
before do
@errors = []
@manager.error_handler do |e|
@events = []
@manager.error_handler do |e, event|
@errors << e
@events << event
end

# block error log
Expand All @@ -387,6 +389,11 @@ def assert_wont_run(t)
assert_equal ['it error'], @errors.map(&:message)
end

it 'registered error_handler gets event that caused the error' do
@manager.tick
assert_equal ['myjob'], @events.map(&:job)
end

it 'error is notified to logger and handler' do
@manager.tick
assert @string_io.string.include?('it error')
Expand Down