make default prefix empty, and minor cleanups (#52)

make default prefix empty, and minor readme & test cleanups

Author: alexeyts

README.md

@@ -36,7 +36,7 @@ echo.delay(message='Hello World!')
 ```
 **NOTE:** This assumes that you have your AWS keys in the appropriate environment variables, or are using IAM roles. Consult the `boto3` [documentation](https://boto3.readthedocs.org/en/latest/) for further info.
 
-If you don't pass a queue name, the `EB_SQS_DEFAULT_QUEUE` setting is used. If not set, the queue name is `default`.
+If you don't pass a queue name, the `EB_SQS_DEFAULT_QUEUE` setting is used. If not set, the queue name is `eb-sqs-default`.
 
 Additionally the task decorator supports `max_retries` (default `0`) and `use_pickle` (default `False`) attributes for advanced control task execution.
 
@@ -98,6 +98,8 @@ This makes the code much simpler, and allows using classes to invoke your method
 
 This is how you would define your class:
 ```python
+from eb_sqs.auto_tasks.service import AutoTaskService
+
 class MyService:
     def __init__(self, p1=default1, ..., pN=defaultN, auto_task_service=None):
         self._auto_task_service = auto_task_service or AutoTaskService()
@@ -132,14 +134,10 @@ The following settings can be used to fine tune django-eb-sqs. Copy them into yo
 - EB_SQS_DEFAULT_DELAY (`0`): Default task delay time in seconds.
 - 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_DEFAULT_QUEUE (`eb-sqs-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. 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_REDIS_CLIENT (`None`): Set the Redis connection client (`StrictRedis`)
-- EB_SQS_REDIS_EXPIRY (`604800`): Default expiry time in seconds until a group is removed
-- EB_SQS_REDIS_KEY_PREFIX (`eb-sqs-`): Prefix used for all Redis keys
+- EB_SQS_QUEUE_PREFIX (``): Prefix to use for the queues. The prefix is added to the queue name.
 - EB_SQS_USE_PICKLE (`False`): Enable to use `pickle` to serialize task parameters. Uses `json` as default.
 - EB_SQS_AWS_MAX_RETRIES (`30`): Default retry limit on a boto3 call to AWS SQS.
 - EB_SQS_REFRESH_PREFIX_QUEUES_S (`10`): Minimal number of seconds to wait between refreshing queue list, in case prefix is used

eb_sqs/settings.py

@@ -9,8 +9,8 @@
 NO_QUEUES_WAIT_TIME_S = getattr(settings, 'NO_QUEUES_WAIT_TIME_S', 5)  # type: int
 
 AUTO_ADD_QUEUE = getattr(settings, 'EB_SQS_AUTO_ADD_QUEUE', False)  # type: bool
-QUEUE_PREFIX = getattr(settings, 'EB_SQS_QUEUE_PREFIX', 'eb-sqs-')  # type: str
-DEFAULT_QUEUE = getattr(settings, 'EB_SQS_DEFAULT_QUEUE', 'default')  # type: str
+QUEUE_PREFIX = getattr(settings, 'EB_SQS_QUEUE_PREFIX', '')  # type: str
+DEFAULT_QUEUE = getattr(settings, 'EB_SQS_DEFAULT_QUEUE', 'eb-sqs-default')  # type: str
 
 EXECUTE_INLINE = getattr(settings, 'EB_SQS_EXECUTE_INLINE', False)  # type: bool
 FORCE_SERIALIZATION = getattr(settings, 'EB_SQS_FORCE_SERIALIZATION', False)  # type: bool
@@ -21,13 +21,6 @@
 
 USE_PICKLE = getattr(settings, 'EB_SQS_USE_PICKLE', False)  # type: bool
 
-GROUP_CALLBACK_TASK = getattr(settings, 'EB_SQS_GROUP_CALLBACK_TASK', None)  # type: Any
-
-REDIS_CLIENT = getattr(settings, 'EB_SQS_REDIS_CLIENT', None)  # type: StrictRedis
-# default: 7 days
-REDIS_EXPIRY = getattr(settings, 'EB_SQS_REDIS_EXPIRY', 3600 * 24 * 7)  # type: int
-REDIS_KEY_PREFIX = getattr(settings, 'EB_SQS_REDIS_KEY_PREFIX', 'eb-sqs-')  # type: str
-
 WORKER_FACTORY = getattr(settings, 'EB_SQS_WORKER_FACTORY', None)  # type: WorkerFactory
 
 DEAD_LETTER_MODE = getattr(settings, 'EB_SQS_DEAD_LETTER_MODE', False)  # type: bool

eb_sqs/tests/auto_tasks/tests_auto_tasks.py

@@ -8,31 +8,31 @@
 
 
 class TestService:
-    _TEST_MOCK = Mock()
-    _MAX_RETRY_NUM = 5
+    TEST_MOCK = None
+    MAX_RETRY_NUM = 5
 
     def __init__(self, auto_task_service=None):
         self._auto_task_service = auto_task_service or AutoTaskService()
 
         self._auto_task_service.register_task(self.task_method)
-        self._auto_task_service.register_task(self.task_retry_method, max_retries=self._MAX_RETRY_NUM)
+        self._auto_task_service.register_task(self.task_retry_method, max_retries=self.MAX_RETRY_NUM)
 
         self._auto_task_service.register_task(self.task_recursive_method)
         self._auto_task_service.register_task(self.task_other_method)
 
     def task_method(self, *args, **kwargs):
-        self._TEST_MOCK.task_method(*args, **kwargs)
+        self.TEST_MOCK.task_method(*args, **kwargs)
 
     def task_retry_method(self, *args, **kwargs):
-        self._TEST_MOCK.task_retry_method(*args, **kwargs)
+        self.TEST_MOCK.task_retry_method(*args, **kwargs)
 
         def max_retry_fun():
-            self._TEST_MOCK.task_max_retry_method(*args, **kwargs)
+            self.TEST_MOCK.task_max_retry_method(*args, **kwargs)
 
         raise RetryableTaskException(Exception('Test'), max_retries_func=max_retry_fun)
 
     def non_task_method(self):
-        self._TEST_MOCK.non_task_method()
+        self.TEST_MOCK.non_task_method()
 
     def task_recursive_method(self, tries=2):
         if tries > 0:
@@ -41,7 +41,7 @@ def task_recursive_method(self, tries=2):
             self.task_other_method()
 
     def task_other_method(self):
-        self._TEST_MOCK.task_other_method()
+        self.TEST_MOCK.task_other_method()
 
 
 class AutoTasksTest(TestCase):
@@ -53,17 +53,19 @@ def setUp(self):
 
         settings.EXECUTE_INLINE = True
 
+        TestService.TEST_MOCK = Mock()
+
     def test_task_method(self):
         self._test_service.task_method(*self._args, **self._kwargs)
 
-        TestService._TEST_MOCK.task_method.assert_called_once_with(*self._args, **self._kwargs)
+        TestService.TEST_MOCK.task_method.assert_called_once_with(*self._args, **self._kwargs)
 
     def test_task_retry_method(self):
         self._test_service.task_retry_method(*self._args, **self._kwargs)
 
-        TestService._TEST_MOCK.task_retry_method.assert_has_calls([call(*self._args, **self._kwargs)] * TestService._MAX_RETRY_NUM)
+        TestService.TEST_MOCK.task_retry_method.assert_has_calls([call(*self._args, **self._kwargs)] * TestService.MAX_RETRY_NUM)
 
-        TestService._TEST_MOCK.task_max_retry_method.assert_called_once_with(*self._args, **self._kwargs)
+        TestService.TEST_MOCK.task_max_retry_method.assert_called_once_with(*self._args, **self._kwargs)
 
     def test_non_task_method(self):
         _auto_task_wrapper.delay(
@@ -73,9 +75,9 @@ def test_non_task_method(self):
             execute_inline=True
         )
 
-        TestService._TEST_MOCK.non_task_method.assert_not_called()
+        TestService.TEST_MOCK.non_task_method.assert_not_called()
 
     def test_task_recursive_method(self):
         self._test_service.task_recursive_method()
 
-        TestService._TEST_MOCK.task_other_method.assert_called_once_with()
+        TestService.TEST_MOCK.task_other_method.assert_called_once_with()

eb_sqs/tests/aws/tests_aws_queue_client.py

@@ -14,6 +14,9 @@
 
 
 class AwsQueueClientTest(TestCase):
+    def setUp(self):
+        settings.QUEUE_PREFIX = 'eb-sqs-'
+
     @mock_sqs()
     def test_add_message(self):
         sqs = boto3.resource('sqs',