cc-py-commons 0.5.38__tar.gz → 0.5.39__tar.gz

{cc_py_commons-0.5.38 → cc_py_commons-0.5.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc_py_commons
-Version: 0.5.38
+Version: 0.5.39
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.38 → cc_py_commons-0.5.39}/cc_py_commons/geolocate.py

@@ -1,8 +1,10 @@
 import googlemaps
 import json
+import traceback
 
 from cc_py_commons.config.env import app_config
 from cc_py_commons.utils.redis import location_db_conn, distance_db_conn, timezone_db_conn
+from cc_py_commons.utils import json_logger
 from ast import literal_eval
 
 def get_location(city, state, zipcode, logger, reset_cache=False):
@@ -86,16 +88,27 @@ def get_distance(origin_latitude, origin_longitude, destination_latitude, destin
 
   if distance_data_dict:
     from_cache = True
+  else:
+    json_logger.debug(None, 'Could not find distance from cache', origin_latitude=origin_latitude,
+      origin_longitude=origin_longitude, destination_latitude=destination_latitude, destination_longitude=destination_longitude,
+      with_duration=with_duration, distance_cache_key=distance_cache_key)
 
   missing_duration_and_is_required = (with_duration and not distance_data_dict.get('duration'))
   if not distance_data_dict or missing_duration_and_is_required:
+      if missing_duration_and_is_required:
+        json_logger.debug(None, 'Looking up distance from google because duration is missing in the cached data and it is required in the response',
+		  origin_latitude=origin_latitude, origin_longitude=origin_longitude, destination_latitude=destination_latitude,
+		  destination_longitude=destination_longitude, with_duration=with_duration, distance_cache_key=distance_cache_key)
       distance_data_dict = __get_google_distance(origin_latitude, origin_longitude, destination_latitude, destination_longitude, logger)
 
   if distance_data_dict:
     if not from_cache or missing_duration_and_is_required:
+      json_logger.debug(None, 'Caching the distance', distance_cache_key=distance_cache_key, distance_data_dict=distance_data_dict)
       __cache_distance(distance_cache_key, distance_data_dict, logger)
   else:
-    logger.debug(f"geolocate.get_distance - Google returned no result for {distance_cache_key}")
+    json_logger.debug(None, 'Google returned no result for distance', origin_latitude=origin_latitude,
+      origin_longitude=origin_longitude, destination_latitude=destination_latitude, destination_longitude=destination_longitude,
+      with_duration=with_duration, distance_cache_key=distance_cache_key)
 
   if distance_data_dict:
     if with_duration:
@@ -374,7 +387,8 @@ def __get_distance_from_cache(distance_cache_key, logger):
       else:
         distance_data['distance'] = float(cached_data)
   except Exception as e:
-    logger.warn("geolocate.__get_distance_from_cache: Error while getting distance from cache", e)
+    json_logger.warning(None, 'Error while getting distance from cache',
+    	error=str(e), stacktrace=traceback.format_exc())
     distance_data = {}
   return distance_data
 

{cc_py_commons-0.5.38 → cc_py_commons-0.5.39}/cc_py_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cc-py-commons
-Version: 0.5.38
+Version: 0.5.39
 Summary: Common code for microservices
 Home-page: https://github.com/Cargo-Chief/py-commons
 Author: CargoChief

{cc_py_commons-0.5.38 → cc_py_commons-0.5.39}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 setup(
     name='cc_py_commons',
     description='Common code for microservices',
-    version='0.5.38',
+    version='0.5.39',
     url='https://github.com/Cargo-Chief/py-commons',
     author='CargoChief',
     author_email='engineering@cargochief.com',