ApiClient: Enable logging of Tenacity retry attempts at INFO level

* Also fix Configuration.debug() to enable these messages to propagate by default (The default log level is not WARNING, it's NOTSET, meaning inherit from parent)
BATS · Apr 24, 2020 · 13a731c · 13a731c
1 parent 5fceef1
commit 13a731c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/opsgenie_sdk/api_client.py b/opsgenie_sdk/api_client.py
@@ -14,6 +14,7 @@
 import copy
 import datetime
 import json
+import logging
 import mimetypes
 from multiprocessing.pool import ThreadPool
 import os
@@ -33,6 +34,7 @@
 from opsgenie_sdk import rest
 from opsgenie_sdk.configuration import Configuration
 from opsgenie_sdk.exceptions import ApiValueError, RetryableException
+from tenacity import before_sleep_log
 
 
 class ApiClient(object):
@@ -81,7 +83,8 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
                                           wait=tenacity.wait_random_exponential(multiplier=configuration.back_off,
                                                                                 max=configuration.retry_delay),
                                           retry=(tenacity.retry_if_exception_type(RetryableException) |
-                                                 (tenacity.retry_if_exception_type(HTTPError))))
+                                                 (tenacity.retry_if_exception_type(HTTPError))),
+                                          before_sleep=before_sleep_log(logging.getLogger("opsgenie_sdk"), logging.INFO, exc_info=True))
 
         self.rest_client = rest.RESTClientObject(configuration, retrying=self.retrying)
         self.default_headers = {}

diff --git a/opsgenie_sdk/configuration.py b/opsgenie_sdk/configuration.py
@@ -176,10 +176,9 @@ def debug(self, value):
             # turn on httplib debug
             httplib.HTTPConnection.debuglevel = 1
         else:
-            # if debug status is False, turn off debug logging,
-            # setting log level to default `logging.WARNING`
+            # if debug status is False, turn off debug logging
             for _, logger in six.iteritems(self.logger):
-                logger.setLevel(logging.WARNING)
+                logger.setLevel(logging.NOTSET)
             # turn off httplib debug
             httplib.HTTPConnection.debuglevel = 0