add request timeout option and update docs

Author: crflynn

README.md

@@ -61,23 +61,27 @@ extension:
 ```python
 DEFAULT_OPTIONS = {
     "slack_beat_init_color": "#FFCC2B",
+    "slack_broker_connect_color": "#36A64F",
+    "slack_broker_disconnect_color": "#D00001",
     "slack_celery_startup_color": "#FFCC2B",
     "slack_celery_shutdown_color": "#660033",
     "slack_task_prerun_color": "#D3D3D3",
     "slack_task_success_color": "#36A64F",
     "slack_task_failure_color": "#D00001",
+    "slack_request_timeout": 1,
     "flower_base_url": None,
+    "show_celery_hostname": False,
     "show_task_id": True,
     "show_task_execution_time": True,
-    "show_celery_hostname": False,
     "show_task_args": True,
     "show_task_kwargs": True,
     "show_task_exception_info": True,
     "show_task_return_value": True,
-    "show_task_prerun": True,
+    "show_task_prerun": False,
     "show_startup": True,
     "show_shutdown": True,
     "show_beat": True,
+    "show_broker": False,
     "use_fixed_width": True,
     "include_tasks": None,
     "exclude_tasks": None,
@@ -103,6 +107,7 @@ Most of the options are self explanatory, but here are some additional details:
 
 * **slack_\*_color**: The left vertical bar color associated with the slack
     message attachments
+* **slack_request_timeout**: The Slack message request timeout in seconds
 * **flower_base_url**: e.g. https://flower.example.com, if provided, the slack
     message titles will link to task pages in
     [Flower](http://flower.readthedocs.io/en/latest/)

README.rst

@@ -84,23 +84,27 @@ extension:
 
     DEFAULT_OPTIONS = {
         "slack_beat_init_color": "#FFCC2B",
+        "slack_broker_connect_color": "#36A64F",
+        "slack_broker_disconnect_color": "#D00001",
         "slack_celery_startup_color": "#FFCC2B",
         "slack_celery_shutdown_color": "#660033",
         "slack_task_prerun_color": "#D3D3D3",
         "slack_task_success_color": "#36A64F",
         "slack_task_failure_color": "#D00001",
+        "slack_request_timeout": 1,
         "flower_base_url": None,
+        "show_celery_hostname": False,
         "show_task_id": True,
         "show_task_execution_time": True,
-        "show_celery_hostname": False,
         "show_task_args": True,
         "show_task_kwargs": True,
         "show_task_exception_info": True,
         "show_task_return_value": True,
-        "show_task_prerun": True,
+        "show_task_prerun": False,
         "show_startup": True,
         "show_shutdown": True,
         "show_beat": True,
+        "show_broker": False,
         "use_fixed_width": True,
         "include_tasks": None,
         "exclude_tasks": None,
@@ -127,6 +131,7 @@ Most of the options are self explanatory, but here are some additional details:
 
 * **slack_\*_color**: The left vertical bar color associated with the slack
     message attachments
+* **slack_request_timeout**: The Slack message request timeout in seconds
 * **flower_base_url**: e.g. https://flower.example.com, if provided, the slack
     message titles will link to task pages
     in `Flower <http://flower.readthedocs.io/en/latest/>`_

celery_slack/slackify.py

@@ -18,6 +18,7 @@
 from .exceptions import InvalidColorException
 from .exceptions import MissingWebhookException
 from .exceptions import TaskFiltrationException
+from celery_slack import slack
 
 
 DEFAULT_OPTIONS = {
@@ -29,6 +30,7 @@
     "slack_task_prerun_color": "#D3D3D3",
     "slack_task_success_color": "#36A64F",
     "slack_task_failure_color": "#D00001",
+    "slack_request_timeout": 1,
     "flower_base_url": None,
     "show_celery_hostname": False,
     "show_task_id": True,
@@ -89,6 +91,8 @@ def __init__(self, app, webhook=None, beat_schedule=None, **options):
         self._decorate_task_methods()
         self._decorate_kombu_retry()
 
+        slack.TIMEOUT = self.options["slack_request_timeout"]
+
     def _connect_signals(self):
         """Connect callbacks to celery signals.
 

docs/usage.rst

@@ -38,23 +38,27 @@ extension:
 
    DEFAULT_OPTIONS = {
        "slack_beat_init_color": "#FFCC2B",
+       "slack_broker_connect_color": "#36A64F",
+       "slack_broker_disconnect_color": "#D00001",
        "slack_celery_startup_color": "#FFCC2B",
        "slack_celery_shutdown_color": "#660033",
        "slack_task_prerun_color": "#D3D3D3",
        "slack_task_success_color": "#36A64F",
        "slack_task_failure_color": "#D00001",
+       "slack_request_timeout": 1,
        "flower_base_url": None,
+       "show_celery_hostname": False,
        "show_task_id": True,
        "show_task_execution_time": True,
-       "show_celery_hostname": False,
        "show_task_args": True,
        "show_task_kwargs": True,
        "show_task_exception_info": True,
        "show_task_return_value": True,
-       "show_task_prerun": True,
+       "show_task_prerun": False,
        "show_startup": True,
        "show_shutdown": True,
        "show_beat": True,
+       "show_broker": False,
        "use_fixed_width": True,
        "include_tasks": None,
        "exclude_tasks": None,

tests/celeryapp/celeryapp.py

@@ -31,6 +31,7 @@
     # "show_celery_hostname": True,
     # "show_startup": False,
     # "show_shutdown": False,
+    "slack_request_timeout": 3,
     "show_broker": True,
 }