Merge pull request #21 from IBM/prajwal-jarali-202411150459

Maximum recursion depth error Fix

Author: saikumar1607

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-10-17T11:22:30Z",
+  "generated_at": "2024-11-15T05:01:17Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

ibm_appconfiguration/configurations/configuration_handler.py

@@ -32,6 +32,14 @@
 from .internal.utils.url_builder import URLBuilder
 from .internal.utils.connectivity import Connectivity
 from .internal.utils.api_manager import APIManager
+import sys
+from time import sleep
+
+# Server max time out is assumed to be 1 week = 604800 seconds = 40320*15
+sys.setrecursionlimit(40320)
+
+# delay between each web socket connection retry
+delay = 15
 
 
 class ConfigurationHandler:
@@ -62,7 +70,7 @@ def __init__(self):
         self.__segment_map = dict()
         self.__live_config_update_enabled = True
         ConfigurationHandler.__instance = self
-        self.__retry_interval = 600
+        self.__retry_interval = 120
         self.__bootstrap_file = None
         self.__persistent_cache_dir = None
         self.__persistent_data = None
@@ -510,15 +518,15 @@ def __fetch_from_api(self):
                     Logger.error(f'error while while fetching {exception}')
             else:
                 Logger.error(response.get_result())
-                if status_code is None:
+                if status_code is None or status_code == 499:
                     """
                     status_code will be None in-case of
                     
                         1. request was retried for [429, 500, 502, 503, 504] status codes which has exceeded the retry count and has raised the exception "requests.exceptions.RetryError".
                         Check api_manager.py for more info.
                         2. request failed due to unknown "Exception".
                     """
-                    Logger.info(config_messages.RETRY_AFTER_TEN_MINUTES)
+                    Logger.info(config_messages.RETRY_AFTER_TWO_MINUTES)
                     timer = Timer(self.__retry_interval, self.__fetch_from_api)
                     timer.daemon = True
                     timer.start()
@@ -534,12 +542,14 @@ def __on_web_socket_callback(self, message=None, error_state=None,
             Logger.debug(f'Received message from socket. {message}')
         elif error_state:
             Logger.error(f'Received error from socket. {error_state}')
+            self.__on_socket_retry = True
+            sleep(delay)
             self.__start_web_socket()
         elif closed_state:
             Logger.error('Received close connection from socket.')
-            if self.__socket is not None:
-                self.__on_socket_retry = True
-                self.__start_web_socket()
+            self.__on_socket_retry = True
+            sleep(delay)
+            self.__start_web_socket()
         elif open_state:
             if self.__on_socket_retry:
                 self.__on_socket_retry = False

ibm_appconfiguration/configurations/internal/common/config_messages.py

@@ -38,5 +38,5 @@
 NO_INTERNET_CONNECTION_ERROR = 'No connection to internet. Please re-connect.'
 PROPERTY_INVALID = "Invalid property_id - "
 CONFIGURATIONS_FETCH_SUCCESS = "Successfully fetched the configurations."
-RETRY_AFTER_TEN_MINUTES = "Failed to fetch the configurations. Retrying after 10 minutes."
+RETRY_AFTER_TWO_MINUTES = "Failed to fetch the configurations. Retrying after 2 minutes."
 INPUT_PARAMETER_NOT_BOOLEAN = "Input parameter passed to use_private_endpoint() method is not boolean. Default value will be used."

ibm_appconfiguration/version.py

@@ -15,4 +15,4 @@
 """
 Version of ibm-appconfiguration-python-sdk
 """
-__version__ = '0.3.4'
+__version__ = '0.3.6'

setup.py

@@ -12,7 +12,7 @@
 from setuptools import setup, find_packages
 
 NAME = "ibm-appconfiguration-python-sdk"
-VERSION = "0.3.5"
+VERSION = "0.3.6"
 # To install the library, run the following
 #
 # python setup.py install