diff --git a/eb_sqs/decorators.py b/eb_sqs/decorators.py index b90b541..4b721ef 100644 --- a/eb_sqs/decorators.py +++ b/eb_sqs/decorators.py @@ -18,7 +18,7 @@ def wrapper(*args, **kwargs): max_retries = _get_kwarg_val(kwargs, 'max_retries', max_retries_count if max_retries_count else settings.DEFAULT_MAX_RETRIES) pickle = _get_kwarg_val(kwargs, 'use_pickle', use_pickle if use_pickle else settings.USE_PICKLE) - execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False) + execute_inline = _get_kwarg_val(kwargs, 'execute_inline', False) or settings.EXECUTE_INLINE delay = _get_kwarg_val(kwargs, 'delay', settings.DEFAULT_DELAY) group_id = _get_kwarg_val(kwargs, 'group_id', None) @@ -32,7 +32,7 @@ def func_retry_decorator(worker_task): # type: (WorkerTask) -> (tuple, dict) def wrapper(*args, **kwargs): # type: (tuple, dict) -> Any - execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False) + execute_inline = _get_kwarg_val(kwargs, 'execute_inline', False) or settings.EXECUTE_INLINE delay = _get_kwarg_val(kwargs, 'delay', settings.DEFAULT_DELAY) count_retries = _get_kwarg_val(kwargs, 'count_retries', settings.DEFAULT_COUNT_RETRIES) diff --git a/setup.py b/setup.py index 7f56034..19cf2f8 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='django-eb-sqs', - version='1.11', + version='1.12', package_dir={'eb_sqs': 'eb_sqs'}, include_package_data=True, packages=find_packages(),