Merge pull request #1422 from brianpetro/master
replace delayed_job queue methods with ActiveJob counterparts
Andrew Cantino
4 changed files with 24 additions and 3 deletions
+ 7
- 0
app/jobs/agent_cleanup_expired_job.rb
@@ -0,0 +1,7 @@ |
||
| 1 |
+class AgentCleanupExpiredJob < ActiveJob::Base |
|
| 2 |
+ queue_as :default |
|
| 3 |
+ |
|
| 4 |
+ def perform |
|
| 5 |
+ Event.cleanup_expired! |
|
| 6 |
+ end |
|
| 7 |
+end |
+ 7
- 0
app/jobs/agent_propagate_job.rb
@@ -0,0 +1,7 @@ |
||
| 1 |
+class AgentPropagateJob < ActiveJob::Base |
|
| 2 |
+ queue_as :default |
|
| 3 |
+ |
|
| 4 |
+ def perform |
|
| 5 |
+ Agent.receive! |
|
| 6 |
+ end |
|
| 7 |
+end |
+ 7
- 0
app/jobs/agent_run_schedule_job.rb
@@ -0,0 +1,7 @@ |
||
| 1 |
+class AgentRunScheduleJob < ActiveJob::Base |
|
| 2 |
+ queue_as :default |
|
| 3 |
+ |
|
| 4 |
+ def perform(time) |
|
| 5 |
+ Agent.run_schedule(time) |
|
| 6 |
+ end |
|
| 7 |
+end |
+ 3
- 3
lib/huginn_scheduler.rb
@@ -149,21 +149,21 @@ class HuginnScheduler < LongRunnable::Worker |
||
| 149 | 149 |
def run_schedule(time) |
| 150 | 150 |
with_mutex do |
| 151 | 151 |
puts "Queuing schedule for #{time}"
|
| 152 |
- Agent.delay.run_schedule(time) |
|
| 152 |
+ AgentRunScheduleJob.perform_later(time) |
|
| 153 | 153 |
end |
| 154 | 154 |
end |
| 155 | 155 |
|
| 156 | 156 |
def propagate! |
| 157 | 157 |
with_mutex do |
| 158 | 158 |
puts "Queuing event propagation" |
| 159 |
- Agent.delay.receive! |
|
| 159 |
+ AgentPropagateJob.perform_later |
|
| 160 | 160 |
end |
| 161 | 161 |
end |
| 162 | 162 |
|
| 163 | 163 |
def cleanup_expired_events! |
| 164 | 164 |
with_mutex do |
| 165 | 165 |
puts "Running event cleanup" |
| 166 |
- Event.delay.cleanup_expired! |
|
| 166 |
+ AgentCleanupExpiredJob.perform_later |
|
| 167 | 167 |
end |
| 168 | 168 |
end |
| 169 | 169 |
|