Change notices for debug

2016-07-25 13:58:01 +02:00
parent f03897257e
commit fc399c12c1
6 changed files with 28 additions and 26 deletions
--- a/server/extension/cdb_dataservices_server--0.13.2--0.13.3.sql
+++ b/server/extension/cdb_dataservices_server--0.13.2--0.13.3.sql
@@ -69,11 +69,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
@@ -124,11 +124,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
--- a/server/extension/cdb_dataservices_server--0.13.3.sql
+++ b/server/extension/cdb_dataservices_server--0.13.3.sql
@@ -1264,15 +1264,15 @@ RETURNS Geometry AS $$
  user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]

  if user_geocoder_config.heremaps_geocoder:
-    plpy.notice('Requested geocoder is heremaps')
+    plpy.debug('Requested geocoder is heremaps')
    here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(here_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  elif user_geocoder_config.google_geocoder:
-    plpy.notice('Requested geocoder is google')
+    plpy.debug('Requested geocoder is google')
    google_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_google_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(google_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  elif user_geocoder_config.mapzen_geocoder:
-    plpy.notice('Requested geocoder is mapzen')
+    plpy.debug('Requested geocoder is mapzen')
    mapzen_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_mapzen_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(mapzen_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  else:
@@ -2190,11 +2190,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
@@ -2241,11 +2241,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
--- a/server/extension/sql/20_geocode_street.sql
+++ b/server/extension/sql/20_geocode_street.sql
@@ -7,15 +7,15 @@ RETURNS Geometry AS $$
  user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]

  if user_geocoder_config.heremaps_geocoder:
-    plpy.notice('Requested geocoder is heremaps')
+    plpy.debug('Requested geocoder is heremaps')
    here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(here_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  elif user_geocoder_config.google_geocoder:
-    plpy.notice('Requested geocoder is google')
+    plpy.debug('Requested geocoder is google')
    google_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_google_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(google_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  elif user_geocoder_config.mapzen_geocoder:
-    plpy.notice('Requested geocoder is mapzen')
+    plpy.debug('Requested geocoder is mapzen')
    mapzen_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_mapzen_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
    return plpy.execute(mapzen_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
  else:
--- a/server/extension/sql/85_isodistance.sql
+++ b/server/extension/sql/85_isodistance.sql
@@ -9,11 +9,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isodistance($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
--- a/server/extension/sql/90_isochrone.sql
+++ b/server/extension/sql/90_isochrone.sql
@@ -9,11 +9,11 @@ RETURNS SETOF cdb_dataservices_server.isoline AS $$
    plpy.error('This service is not available for google service users.')

  if user_isolines_config.heremaps_provider:
-    plpy.notice('Requested isolines provider is heremaps')
+    plpy.debug('Requested isolines provider is heremaps')
    here_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_here_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(here_plan, [username, orgname, source, mode, range, options], 1)
  elif user_isolines_config.mapzen_provider:
-    plpy.notice('Requested isolines provider is mapzen')
+    plpy.debug('Requested isolines provider is mapzen')
    mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server.cdb_mapzen_isochrone($1, $2, $3, $4, $5, $6) as isoline; ", ["text", "text", "geometry(geometry, 4326)", "text", "integer[]", "text[]"])
    return plpy.execute(mapzen_plan, [username, orgname, source, mode, range, options], 1)
  else:
--- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
+++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
@@ -535,16 +535,18 @@ class ServicesRedisConfig:
    def __get_user_config(self, username, orgname):
        user_config = self._redis_connection.hgetall(
            "rails:users:{0}".format(username))
-        # Not all the users have the provider key yet
-        if not self.GEOCODER_PROVIDER_KEY in user_config:
-            user_config[self.GEOCODER_PROVIDER_KEY] = ''
-        if not self.ISOLINES_PROVIDER_KEY in user_config:
-            user_config[self.ISOLINES_PROVIDER_KEY] = ''
-        if not self.ROUTING_PROVIDER_KEY in user_config:
-            user_config[self.ROUTING_PROVIDER_KEY] = ''
        if not user_config:
            raise ConfigException("""There is no user config available. Please check your configuration.'""")
-        elif orgname:
+
+        # Not all the users have the provider key yet
+        if self.GEOCODER_PROVIDER_KEY not in user_config:
+            user_config[self.GEOCODER_PROVIDER_KEY] = ''
+        if not self.ISOLINES_PROVIDER_KEY not in user_config:
+            user_config[self.ISOLINES_PROVIDER_KEY] = ''
+        if not self.ROUTING_PROVIDER_KEY not in user_config:
+            user_config[self.ROUTING_PROVIDER_KEY] = ''
+
+        if orgname:
            self.__get_organization_config(orgname, user_config)

        return user_config