Dont re-raise the exception to avoid leak sensitive information

server/extension/sql/100_routing_helper.sql

@@ -58,8 +58,8 @@ RETURNS cdb_dataservices_server.simple_route AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to get mapzen routing', sys.exc_info())
-    raise e
+    logger.error('Error trying to calculate mapzen routing', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to calculate mapzen routing')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu SECURITY DEFINER;

server/extension/sql/110_data_observatory_augmentation.sql

@@ -61,8 +61,8 @@ RETURNS json AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to obst_get_demographic_snapshot', sys.exc_info())
-      raise e
+      logger.error('Error trying to obs_get_demographic_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to obs_get_demographic_snapshot')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -115,8 +115,8 @@ RETURNS SETOF JSON AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to obs_get_demographic_snapshot', sys.exc_info())
-      raise e
+      logger.error('Error trying to obs_get_demographic_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to obs_get_demographic_snapshot')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -164,8 +164,8 @@ RETURNS json AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to obs_get_segment_snapshot', sys.exc_info())
-      raise e
+      logger.error('Error trying to obs_get_segment_snapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to obs_get_segment_snapshot')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -216,8 +216,8 @@ RETURNS SETOF JSON AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetSegmentSnapshot', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetSegmentSnapshot', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetSegmentSnapshot')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -270,8 +270,8 @@ RETURNS NUMERIC AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetMeasure', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetMeasure', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetMeasure')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -322,8 +322,8 @@ RETURNS TEXT AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetCategory', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetCategory', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetCategory')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -376,8 +376,8 @@ RETURNS NUMERIC AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetUSCensusMeasure', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetUSCensusMeasure', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetUSCensusMeasure')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -428,8 +428,8 @@ RETURNS TEXT AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetUSCensusCategory', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetUSCensusCategory', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetUSCensusCategory')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -480,8 +480,8 @@ RETURNS NUMERIC AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetPopulation', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetPopulation', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetPopulation')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -532,8 +532,8 @@ RETURNS NUMERIC AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetMeasureById', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetMeasureById', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetMeasureById')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/115_data_observatory_exploration.sql

@@ -48,8 +48,8 @@ RETURNS TABLE(id text, description text, name text, aggregate text, source text)
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_Search', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_Search', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_Search')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -103,8 +103,8 @@ RETURNS TABLE(boundary_id text, description text, time_span text, tablename text
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetMeasureById', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetMeasureById', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetMeasureById')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/120_data_observatory_geometries.sql

@@ -42,8 +42,8 @@ RETURNS geometry(Geometry, 4326) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetBoundary', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetBoundary', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetBoundary')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -92,8 +92,8 @@ RETURNS TEXT AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetBoundaryId', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetBoundaryId', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetBoundaryId')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -142,8 +142,8 @@ RETURNS geometry(Geometry, 4326) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetBoundaryById', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetBoundaryById', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetBoundaryById')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -199,8 +199,8 @@ RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetBoundariesByGeometry', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetBoundariesByGeometry', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetBoundariesByGeometry')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -258,8 +258,8 @@ RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetBoundariesByPointAndRadius', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetBoundariesByPointAndRadius', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetBoundariesByPointAndRadius')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -315,8 +315,8 @@ RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetPointsByGeometry', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetPointsByGeometry', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetPointsByGeometry')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -374,8 +374,8 @@ RETURNS TABLE(the_geom geometry, geom_refs text) AS $$
   except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to OBS_GetPointsByPointAndRadius', sys.exc_info())
-      raise e
+      logger.error('Error trying to OBS_GetPointsByPointAndRadius', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to OBS_GetPointsByPointAndRadius')
   finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/20_geocode_street.sql

@@ -94,8 +94,8 @@ RETURNS Geometry AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to geocode street point using here maps', sys.exc_info())
-    raise e
+    logger.error('Error trying to geocode street point using here maps', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to geocode street point using here maps')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -127,8 +127,8 @@ RETURNS Geometry AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to geocode street point using google maps', sys.exc_info())
-    raise e
+    logger.error('Error trying to geocode street point using google maps', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to geocode street point using google maps')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -168,8 +168,8 @@ RETURNS Geometry AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to geocode street point using mapzen', sys.exc_info())
-    raise e
+    logger.error('Error trying to geocode street point using mapzen', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to geocode street point using mapzen')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/30_admin0.sql

@@ -25,8 +25,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode admin0 polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode admin0 polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode admin0 polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/40_admin1.sql

@@ -26,8 +26,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode admin1 polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode admin1 polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode admin1 polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -60,8 +60,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode admin1 polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode admin1 polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode admin1 polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/50_namedplaces.sql

@@ -27,8 +27,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode namedplace point', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode namedplace point', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode namedplace point')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -61,8 +61,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode namedplace point', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode namedplace point', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode namedplace point')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -95,8 +95,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode namedplace point', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode namedplace point', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode namedplace point')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/60_postalcodes.sql

@@ -25,8 +25,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode postal code point', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode postal code point', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode postal code point')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -58,8 +58,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode postal code point', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode postal code point', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode postal code point')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -91,8 +91,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode postal code polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode postal code polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode postal code polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;
@@ -124,8 +124,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode postal code polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode postal code polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode postal code polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/70_ips.sql

@@ -25,8 +25,8 @@ RETURNS Geometry AS $$
     except BaseException as e:
       import sys
       quota_service.increment_failed_service_use()
-      logger.error('Error trying to geocode postal code polygon', sys.exc_info())
-      raise e
+      logger.error('Error trying to geocode postal code polygon', sys.exc_info(), data={"username": username, "orgname": orgname})
+      raise Exception('Error trying to geocode postal code polygon')
     finally:
       quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu;

server/extension/sql/80_isolines_helper.sql

@@ -50,8 +50,8 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to get mapzen isolines', sys.exc_info())
-    raise e
+    logger.error('Error trying to get mapzen isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get mapzen isolines')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu SECURITY DEFINER;
@@ -123,8 +123,8 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
   except BaseException as e:
     import sys
     quota_service.increment_failed_service_use()
-    logger.error('Error trying to get mapzen isolines', sys.exc_info())
-    raise e
+    logger.error('Error trying to get mapzen isolines', sys.exc_info(), data={"username": username, "orgname": orgname})
+    raise Exception('Error trying to get mapzen isolines')
   finally:
     quota_service.increment_total_service_use()
 $$ LANGUAGE plpythonu SECURITY DEFINER;