Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2018-04-27 13:41:32 +02:00
commit a541e6194c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/scheduler.rb
View file

@ -251,7 +251,8 @@ class Scheduler < ApplicationModel
# restart job again # restart job again
if try_run_max > try_count if try_run_max > try_count
sleep(try_count) # wait between retries (see https://github.com/zammad/zammad/issues/1950) # wait between retries (see https://github.com/zammad/zammad/issues/1950)
sleep(try_count) if Rails.env.production?
_start_job(job, try_count, try_run_time) _start_job(job, try_count, try_run_time)
else else
# release thread lock and remove thread handle # release thread lock and remove thread handle