-
Notifications
You must be signed in to change notification settings - Fork 279
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Add correct namespace to JobData class - Rename job_data.rb spec to job_data_spec.rb - Detect when the job.payload_object respond to :object or not
- Loading branch information
1 parent
e631da1
commit 5037940
Showing
3 changed files
with
38 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,45 @@ | ||
class JobData | ||
attr_reader :job | ||
module Rollbar | ||
module Delayed | ||
class JobData | ||
attr_reader :job | ||
|
||
def initialize(job) | ||
@job = job | ||
end | ||
def initialize(job) | ||
@job = job | ||
end | ||
|
||
def to_hash | ||
job_data = if job.respond_to?(:as_json) | ||
job.as_json | ||
else | ||
Hash[job.to_hash.map { |k, v| [k.to_s, v] }] | ||
end | ||
def to_hash | ||
job_data = extract_job_data | ||
|
||
handler_parent = job_data['job'] ? job_data['job'] : job_data | ||
handler_parent['handler'] = handler_data | ||
handler_parent = job_data['job'] ? job_data['job'] : job_data | ||
handler_parent['handler'] = handler_data | ||
|
||
job_data | ||
end | ||
job_data | ||
end | ||
|
||
private | ||
|
||
def extract_job_data | ||
if job.respond_to?(:as_json) | ||
job.as_json | ||
else | ||
Hash[job.to_hash.map { |k, v| [k.to_s, v] }] | ||
end | ||
end | ||
|
||
private | ||
def handler_data | ||
payload_object = job.payload_object | ||
|
||
def handler_data | ||
object = job.payload_object.object | ||
return payload_object unless payload_object.respond_to?(:object) | ||
|
||
{ | ||
:method_name => job.payload_object.method_name, | ||
:args => job.payload_object.args, | ||
:object => object.is_a?(Class) ? object.name : object.to_s | ||
} | ||
rescue | ||
{} | ||
object = job.payload_object.object | ||
{ | ||
:method_name => job.payload_object.method_name, | ||
:args => job.payload_object.args, | ||
:object => object.is_a?(Class) ? object.name : object.to_s | ||
} | ||
rescue | ||
{} | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
spec/rollbar/plugins/delayed_job/job_data.rb → ...lbar/plugins/delayed_job/job_data_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters