Comment quota code

This commit is contained in:
Carla Iriberri 2016-02-10 17:20:33 +01:00
parent b97ce043c3
commit e996d3796a
3 changed files with 8 additions and 34 deletions

View File

@ -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 $$

View File

@ -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;

View File

@ -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$$;