Merge branch 'hotfix/2.6.5'

aaxelb · aaxelb · commit c7eccd9fe331 · 2017-04-06T10:41:42.000-04:00
diff --git a/share/tasks.py b/share/tasks.py
@@ -314,7 +314,7 @@ def do_run(self, start=None, end=None, limit=None, force=False, superfluous=Fals
                 raise self.retry(
                     exc=e,
                     max_retries=99999,
-                    countdown=min((random.random() + 1) * (settings.CELERY_RETRY_BACKOFF_BASE ** self.request.retries), (random.random() + 1) * 60 * 15)
+                    countdown=(random.random() + 1) * min(settings.CELERY_RETRY_BACKOFF_BASE ** self.request.retries, 60 * 15)
                 )
             except Exception as e:
                 log.fail(e)

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ def do_run(self, start=None, end=None, limit=None, force=False, superfluous=Fals`
`314`	`314`	`raise self.retry(`
`315`	`315`	`exc=e,`
`316`	`316`	`max_retries=99999,`
`317`		`- countdown=min((random.random() + 1) * (settings.CELERY_RETRY_BACKOFF_BASE ** self.request.retries), (random.random() + 1) * 60 * 15)`
	`317`	`+ countdown=(random.random() + 1) * min(settings.CELERY_RETRY_BACKOFF_BASE ** self.request.retries, 60 * 15)`
`318`	`318`	`)`
`319`	`319`	`except Exception as e:`
`320`	`320`	`log.fail(e)`