Skip to content
Snippets Groups Projects
Commit 36f7a9f6 authored by Calum Mackervoy's avatar Calum Mackervoy Committed by Jean-Baptiste Pasquier
Browse files

feature: do_post accepts timeout parameter, settings DEFAULT_REQUEST_TIMEOUT

parent d100614b
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ SCHEDULER_SETTINGS = { ...@@ -32,6 +32,7 @@ SCHEDULER_SETTINGS = {
MAX_ACTIVITY_RESCHEDULES = getattr(settings, 'MAX_ACTIVITY_RESCHEDULES', 3) MAX_ACTIVITY_RESCHEDULES = getattr(settings, 'MAX_ACTIVITY_RESCHEDULES', 3)
DEFAULT_BACKOFF_FACTOR = getattr(settings, 'DEFAULT_BACKOFF_FACTOR', 1) DEFAULT_BACKOFF_FACTOR = getattr(settings, 'DEFAULT_BACKOFF_FACTOR', 1)
DEFAULT_ACTIVITY_DELAY = getattr(settings, 'DEFAULT_ACTIVITY_DELAY', 3) DEFAULT_ACTIVITY_DELAY = getattr(settings, 'DEFAULT_ACTIVITY_DELAY', 3)
DEFAULT_REQUEST_TIMEOUT = getattr(settings, 'DEFAULT_REQUEST_TIMEOUT', 10)
activity_sending_finished = Signal() activity_sending_finished = Signal()
...@@ -82,7 +83,7 @@ class ActivityQueueService: ...@@ -82,7 +83,7 @@ class ActivityQueueService:
cls.revive_activities() cls.revive_activities()
@classmethod @classmethod
def do_post(cls, url, activity, auth=None): def do_post(cls, url, activity, auth=None, timeout=DEFAULT_REQUEST_TIMEOUT):
''' '''
makes a POST request to url, passing activity makes a POST request to url, passing activity
:returns: response from server :returns: response from server
...@@ -93,7 +94,7 @@ class ActivityQueueService: ...@@ -93,7 +94,7 @@ class ActivityQueueService:
if getattr(settings, 'DISABLE_OUTBOX', False) == 'DEBUG': if getattr(settings, 'DISABLE_OUTBOX', False) == 'DEBUG':
return {'data': {}} return {'data': {}}
return requests.post(url, data=json.dumps(activity), headers=headers, timeout=10) return requests.post(url, data=json.dumps(activity), headers=headers, timeout=timeout)
@classmethod @classmethod
def _save_activity_from_response(cls, response, url, scheduled_activity): def _save_activity_from_response(cls, response, url, scheduled_activity):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment