Merge pull request #43 from hellohaptik/develop

Develop to Master

Author: haptikrajasashtikar

FeatureToggle/__init__.py

@@ -1,5 +1,6 @@
 # Python Imports
 import redis
+from redis.exceptions import LockError, BusyLoadingError, ConnectionError, RedisError
 import pickle
 from typing import Dict, Any, Optional
 
@@ -88,10 +89,14 @@ def update_cache(data: Dict[str, Any]) -> None:
             FeatureToggles.__cache.set(
                 consts.FEATURES_URL, pickle.dumps(data)
             )
+        except (LockError, BusyLoadingError, ConnectionError, RedisError) as redis_err:
+            error_msg = f'Redis Exception occurred while updating the redis cache: {str(redis_err)}'
+            LOGGER.info(error_msg)
+            raise Exception(error_msg)
         except Exception as err:
-            raise Exception(
-                f'Exception occurred while updating the redis cache: {str(err)}'
-            )
+            error_msg = f'Unknown Exception occurred while updating the redis cache: {str(err)}'
+            LOGGER.info(error_msg)
+            raise Exception(error_msg)
         LOGGER.info(f'[Feature Toggles] Cache Updated')
 
     @staticmethod
@@ -148,7 +153,8 @@ def is_enabled_for_domain(feature_name: str,
             (bool): True if Feature is enabled else False
         """
         feature_toggles = FeatureToggles.fetch_feature_toggles()
-        LOGGER.info(f"Enable_for_domain_FT_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Enable_for_domain_FT_cache_info: "
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         return domain_name in feature_toggles.get(feature_name, {}).get('domain_names', [])
 
     @staticmethod
@@ -163,7 +169,8 @@ def is_enabled_for_partner(feature_name: str,
             (bool): True if Feature is enabled else False
         """
         feature_toggles = FeatureToggles.fetch_feature_toggles()
-        LOGGER.info(f"Enable_for_partner_FT_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Enable_for_partner_FT_cache_info: "
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         return partner_name in feature_toggles.get(feature_name, {}).get('partner_names', [])
 
     @staticmethod
@@ -178,7 +185,8 @@ def is_enabled_for_business(feature_name: str,
             (bool): True if Feature is enabled else False
         """
         feature_toggles = FeatureToggles.fetch_feature_toggles()
-        LOGGER.info(f"Enable_for_business_FT_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Enable_for_business_FT_cache_info: "
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         return business_via_name in feature_toggles.get(feature_name, {}).get('business_via_names', [])
 
     @staticmethod
@@ -193,7 +201,8 @@ def is_enabled_for_expert(feature_name: str,
             (bool): True if Feature is enabled else False
         """
         feature_toggles = FeatureToggles.fetch_feature_toggles()
-        LOGGER.info(f"Enable_for_expert_FT_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Enable_for_expert_FT_cache_info: "
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         return expert_email in feature_toggles.get(feature_name, {}).get('expert_emails', [])
 
     @staticmethod
@@ -208,7 +217,8 @@ def is_enabled_for_team(feature_name: str,
             (bool): True if feature is enabled else False
         """
         feature_toggles = FeatureToggles.fetch_feature_toggles()
-        LOGGER.info(f"Enable_for_team_FT_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Enable_for_team_FT_cache_info: "
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         return team_id in feature_toggles.get(feature_name, {}).get('team_ids', [])
 
     @staticmethod
@@ -226,19 +236,18 @@ def fetch_feature_toggles():
             }
         """
         # TODO: Remove the cas and environment name from the feature toggles while returning the response
+        response = {}
         LOGGER.info(f'Loading Feature Toggles from Redis')
-        LOGGER.info(f"Efetch_feature_toggles_cache_info: {FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
+        LOGGER.info(f"Fetch_feature_toggles_cache_info:"
+                    f"{FeatureToggles.fetch_feature_toggles.__wrapped__.cache_info()}")
         if FeatureToggles.__cache is None:
-            raise Exception(
-                'To update cache Feature Toggles class needs to be initialised'
-            )
-
-        feature_toggles = pickle.loads(
-            FeatureToggles.__cache.get(consts.FEATURES_URL)
-        )
-        response = {}
+            LOGGER.error('To update cache Feature Toggles class needs to be initialised')
+            return response
 
         try:
+            feature_toggles = pickle.loads(
+                FeatureToggles.__cache.get(consts.FEATURES_URL)
+            )
             if feature_toggles:
                 for feature_toggle in feature_toggles:
                     full_feature_name = feature_toggle['name']
@@ -286,5 +295,5 @@ def fetch_feature_toggles():
                         response[full_feature_name]['team_ids'] = team_ids
         except Exception as err:
             # Handle this exception from where this util gets called
-            raise Exception(f'An error occurred while parsing the response: {str(err)}')
+            LOGGER.error(f'An error occurred while parsing the response: {str(err)}')
         return response