Merge pull request #29 from cuda-networks/execute_inline_fix

override execute_inline with global setting

Author: alexeyts

README.md

@@ -148,7 +148,7 @@ The following settings can be used to fine tune django-eb-sqs. Copy them into yo
 - EB_SQS_DEFAULT_MAX_RETRIES (`0`): Default retry limit for all tasks.
 - EB_SQS_DEFAULT_COUNT_RETRIES (`True`): Count retry calls. Needed if max retries check shall be executed.
 - EB_SQS_DEFAULT_QUEUE (`default`): Default queue name if none is specified when creating a task.
-- EB_SQS_EXECUTE_INLINE (`False`): Execute tasks immediately without using SQS. Useful during development.
+- EB_SQS_EXECUTE_INLINE (`False`): Execute tasks immediately without using SQS. Useful during development. Global setting `True` will override setting it on a task level.
 - EB_SQS_FORCE_SERIALIZATION (`False`): Forces serialization of tasks when executed `inline`. This setting is helpful during development to see if all arguments are serialized and deserialized properly.
 - EB_SQS_GROUP_CALLBACK_TASK (`None`): Group callback (String or Function). Must be a valid task.
 - EB_SQS_QUEUE_PREFIX (`eb-sqs-`): Prefix to use for the queues. The prefix is added to the queue name.

eb_sqs/decorators.py

@@ -2,37 +2,39 @@
 
 from eb_sqs import settings
 from eb_sqs.worker.worker_factory import WorkerFactory
+from eb_sqs.worker.worker_task import WorkerTask
+
+
+def _get_kwarg_val(kwargs, key, default):
+    # type: (dict, str, Any) -> Any
+    return kwargs.pop(key, default) if kwargs else default
 
 
 def func_delay_decorator(func, queue_name, max_retries_count, use_pickle):
-    # type: (Any, unicode, int, bool) -> (tuple, dict)
+    # type: (Any, str, int, bool) -> (tuple, dict)
     def wrapper(*args, **kwargs):
         # type: (tuple, dict) -> Any
         queue = _get_kwarg_val(kwargs, 'queue_name', queue_name if queue_name else settings.DEFAULT_QUEUE)
         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 = _get_kwarg_val(kwargs, 'execute_inline',  settings.EXECUTE_INLINE)
+        execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False)
         delay = _get_kwarg_val(kwargs, 'delay',  settings.DEFAULT_DELAY)
         group_id = _get_kwarg_val(kwargs, 'group_id', None)
 
         worker = WorkerFactory.default().create()
         return worker.delay(group_id, queue, func, args, kwargs, max_retries, pickle, delay, execute_inline)
 
-    def _get_kwarg_val(kwargs, key, default):
-        # type: (dict, unicode, Any) -> Any
-        return kwargs.pop(key, default) if kwargs else default
-
     return wrapper
 
 
 def func_retry_decorator(worker_task):
     # type: (WorkerTask) -> (tuple, dict)
     def wrapper(*args, **kwargs):
         # type: (tuple, dict) -> Any
-        execute_inline = kwargs.pop('execute_inline', settings.EXECUTE_INLINE) if kwargs else settings.EXECUTE_INLINE
-        delay = kwargs.pop('delay', settings.DEFAULT_DELAY) if kwargs else settings.DEFAULT_DELAY
-        count_retries = kwargs.pop('count_retries', settings.DEFAULT_COUNT_RETRIES) if kwargs else settings.DEFAULT_COUNT_RETRIES
+        execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False)
+        delay = _get_kwarg_val(kwargs, 'delay', settings.DEFAULT_DELAY)
+        count_retries = _get_kwarg_val(kwargs, 'count_retries', settings.DEFAULT_COUNT_RETRIES)
 
         worker = WorkerFactory.default().create()
         return worker.retry(worker_task, delay, execute_inline, count_retries)
@@ -41,7 +43,7 @@ def wrapper(*args, **kwargs):
 
 class task(object):
     def __init__(self, queue_name=None, max_retries=None, use_pickle=None):
-        # type: (unicode, int, bool) -> None
+        # type: (str, int, bool) -> None
         self.queue_name = queue_name
         self.max_retries = max_retries
         self.use_pickle = use_pickle

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-eb-sqs',
-    version='1.10',
+    version='1.11',
     package_dir={'eb_sqs': 'eb_sqs'},
     include_package_data=True,
     packages=find_packages(),