Merge remote-tracking branch 'origin/development' into 302-expose-quotas

This commit is contained in:
Rafa de la Torre
2016-11-24 12:36:23 +01:00
36 changed files with 9772 additions and 37 deletions

View File

@@ -100,7 +100,7 @@ class MapzenGeocoderConfigBuilder(object):
period_end_date = date_parse(period_end_date_str)
logger_conf = self._server_conf.get('logger_conf')
log_path = logger_conf['geocoder_log_path']
log_path = logger_conf.get('geocoder_log_path', None)
return MapzenGeocoderConfig(geocoding_quota,
soft_geocoding_limit,