cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for the mandatories configurations in Redis before proceed

Browse Source
This commit is contained in:
Mario de Frutos
2016-01-25 08:17:03 +01:00
parent 62ade7f1a0
commit fffcef90a5
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py
View File

@@ -41,20 +41,29 @@ class GeocoderConfig:
heremaps_app_code=None): heremaps_app_code=None):
user_config = self._redis_connection.hgetall( user_config = self._redis_connection.hgetall(
"rails:users:{0}".format(username)) "rails:users:{0}".format(username))
user_config[self.USERNAME_KEY] = username if not user_config:
user_config[self.ORGNAME_KEY] = orgname raise ConfigException("""There is no user config available. Please check your configuration.'""")
user_config[self.NOKIA_GEOCODER_APP_ID_KEY] = heremaps_app_id else:
user_config[self.NOKIA_GEOCODER_APP_CODE_KEY] = heremaps_app_code user_config[self.USERNAME_KEY] = username
if orgname: user_config[self.ORGNAME_KEY] = orgname
org_config = self._redis_connection.hgetall( user_config[self.NOKIA_GEOCODER_APP_ID_KEY] = heremaps_app_id
"rails:orgs:{0}".format(orgname)) user_config[self.NOKIA_GEOCODER_APP_CODE_KEY] = heremaps_app_code
if orgname:
self.__get_organization_config(orgname, user_config)
return user_config
def __get_organization_config(self, orgname, user_config):
org_config = self._redis_connection.hgetall(
"rails:orgs:{0}".format(orgname))
if not org_config:
raise ConfigException("""There is no organization config available. Please check your configuration.'""")
else:
user_config[self.QUOTA_KEY] = org_config[self.QUOTA_KEY] user_config[self.QUOTA_KEY] = org_config[self.QUOTA_KEY]
user_config[self.PERIOD_END_DATE] = org_config[self.PERIOD_END_DATE] user_config[self.PERIOD_END_DATE] = org_config[self.PERIOD_END_DATE]
user_config[self.GOOGLE_GEOCODER_CLIENT_ID] = org_config[self.GOOGLE_GEOCODER_CLIENT_ID] user_config[self.GOOGLE_GEOCODER_CLIENT_ID] = org_config[self.GOOGLE_GEOCODER_CLIENT_ID]
user_config[self.GOOGLE_GEOCODER_API_KEY] = org_config[self.GOOGLE_GEOCODER_API_KEY] user_config[self.GOOGLE_GEOCODER_API_KEY] = org_config[self.GOOGLE_GEOCODER_API_KEY]
return user_config
def __check_config(self, filtered_config): def __check_config(self, filtered_config):
if filtered_config[self.GEOCODER_TYPE].lower() == self.NOKIA_GEOCODER: if filtered_config[self.GEOCODER_TYPE].lower() == self.NOKIA_GEOCODER:
if not set(self.NOKIA_GEOCODER_MANDATORY_KEYS).issubset(set(filtered_config.keys())): if not set(self.NOKIA_GEOCODER_MANDATORY_KEYS).issubset(set(filtered_config.keys())):
@@ -63,8 +72,7 @@ class GeocoderConfig:
raise ConfigException("""Nokia geocoder configuration is missing. Check it please""") raise ConfigException("""Nokia geocoder configuration is missing. Check it please""")
elif filtered_config[self.GEOCODER_TYPE].lower() == self.GOOGLE_GEOCODER: elif filtered_config[self.GEOCODER_TYPE].lower() == self.GOOGLE_GEOCODER:
if self.GOOGLE_GEOCODER_API_KEY not in filtered_config.keys(): if self.GOOGLE_GEOCODER_API_KEY not in filtered_config.keys():
raise ConfigException("""Google geocoder need the mandatory raise ConfigException("""Google geocoder need the mandatory parameter 'google_maps_private_key'""")
parameter 'google_maps_private_key'""")
return True return True