fixes conflicts

This commit is contained in:
rgarcia
2016-12-27 12:05:37 +01:00
parent 113c4551aa
commit c9f62bf2b9

View File

@@ -6,7 +6,7 @@ end
Delayed::Worker.destroy_failed_jobs = false
Delayed::Worker.sleep_delay = 2
Delayed::Worker.max_attempts = 3
Delayed::Worker.max_run_time = 30.seconds
Delayed::Worker.max_run_time = 10.minutes
Delayed::Worker.read_ahead = 10
Delayed::Worker.default_queue_name = 'default'
Delayed::Worker.raise_signal_exceptions = :term