From e996d3796a73105d3ceb40298793d81b310d9f23 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Wed, 10 Feb 2016 17:20:33 +0100 Subject: [PATCH] Comment quota code --- server/extension/sql/0.4.0/15_config_helper.sql | 11 ----------- server/extension/sql/0.4.0/80_routing_helper.sql | 16 ++++++++-------- .../sql/0.4.0/90_geocoder_server_user.sql | 15 --------------- 3 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 server/extension/sql/0.4.0/90_geocoder_server_user.sql diff --git a/server/extension/sql/0.4.0/15_config_helper.sql b/server/extension/sql/0.4.0/15_config_helper.sql index 8326e9a..47aad42 100644 --- a/server/extension/sql/0.4.0/15_config_helper.sql +++ b/server/extension/sql/0.4.0/15_config_helper.sql @@ -24,17 +24,6 @@ RETURNS boolean AS $$ return True $$ LANGUAGE plpythonu SECURITY DEFINER; -CREATE OR REPLACE FUNCTION _cdb_configure_heremaps(app_id text, app_code text) -RETURNS void AS $$ -DECLARE - conf json; -BEGIN - conf := format('{"app_id": "%s", "app_code": "%s"}', app_id, app_code); - PERFORM cartodb.CDB_Conf_SetConf('heremaps', conf); -END -$$ LANGUAGE plpgsql; - -routing, key cambia, clase cambia, routingconfim routing_here -- Get the Redis configuration from the _conf table -- CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_routing_config(username text, orgname text) RETURNS boolean AS $$ diff --git a/server/extension/sql/0.4.0/80_routing_helper.sql b/server/extension/sql/0.4.0/80_routing_helper.sql index 0561767..14571d9 100644 --- a/server/extension/sql/0.4.0/80_routing_helper.sql +++ b/server/extension/sql/0.4.0/80_routing_helper.sql @@ -4,15 +4,15 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(us RETURNS SETOF isoline AS $$ import json from cartodb_services.here import HereMapsRoutingIsoline - from cartodb_services.metrics import QuotaService + --from cartodb_services.metrics import QuotaService redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] user_routing_config = GD["user_routing_config_{0}".format(username)] # -- Check the quota - quota_service = QuotaService(user_routing_config, redis_conn) - if not quota_service.check_user_quota(): - plpy.error('You have reach the limit of your quota') + -- quota_service = QuotaService(user_routing_config, redis_conn) + --if not quota_service.check_user_quota(): + -- plpy.error('You have reach the limit of your quota') try: client = HereMapsRoutingIsoline(user_routing_config.heremaps_app_id, user_routing_config.heremaps_app_code) @@ -39,19 +39,19 @@ RETURNS SETOF isoline AS $$ multipolygon = cdb.here.types.geo_polyline_to_multipolygon(polyline) result.append([source_str, mode, range, multipolygon]) - quota_service.increment_isolines_service_use(len(resp)) + --quota_service.increment_isolines_service_use(len(resp)) return result else: - quota_service.increment_empty_geocoder_use() + --quota_service.increment_empty_geocoder_use() except BaseException as e: import sys, traceback type_, value_, traceback_ = sys.exc_info() - quota_service.increment_failed_geocoder_use() + --quota_service.increment_failed_geocoder_use() error_msg = 'There was an error trying to obtain isodistances using here maps geocoder: {0}'.format(e) plpy.notice(traceback.format_tb(traceback_)) plpy.error(error_msg) finally: - quota_service.increment_total_geocoder_use() + -- quota_service.increment_total_geocoder_use() $$ LANGUAGE plpythonu SECURITY DEFINER; \ No newline at end of file diff --git a/server/extension/sql/0.4.0/90_geocoder_server_user.sql b/server/extension/sql/0.4.0/90_geocoder_server_user.sql deleted file mode 100644 index e011682..0000000 --- a/server/extension/sql/0.4.0/90_geocoder_server_user.sql +++ /dev/null @@ -1,15 +0,0 @@ -DO $$ -BEGIN - IF NOT EXISTS ( - SELECT * - FROM pg_catalog.pg_user - WHERE usename = 'geocoder_api') THEN - - CREATE USER geocoder_api; - END IF; - GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_dataservices_server TO geocoder_api; - GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO geocoder_api; - GRANT USAGE ON SCHEMA cdb_dataservices_server TO geocoder_api; - GRANT USAGE ON SCHEMA public TO geocoder_api; - GRANT SELECT ON ALL TABLES IN SCHEMA public TO geocoder_api; -END$$;