From bd2e3802259d587f3309e961fee5fa2365915b1a Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Tue, 8 Mar 2016 16:08:56 +0100
Subject: [PATCH] Add logger for the internal geocoder too

---
 .../cdb_dataservices_server--0.5.0--0.5.1.sql | 22 +++++++++----------
 .../cdb_dataservices_server--0.5.1.sql        | 22 +++++++++----------
 server/extension/sql/0.5.1/30_admin0.sql      |  2 +-
 server/extension/sql/0.5.1/40_admin1.sql      |  4 ++--
 server/extension/sql/0.5.1/50_namedplaces.sql |  6 ++---
 server/extension/sql/0.5.1/60_postalcodes.sql |  8 +++----
 server/extension/sql/0.5.1/70_ips.sql         |  2 +-
 .../test/0.5.0/expected/00_install_test.out   | 14 +++++++++++-
 .../test/0.5.1/sql/00_install_test.sql        |  4 ++--
 .../cartodb_services/metrics/config.py        | 12 +++++++---
 server/lib/python/cartodb_services/path       |  4 ----
 .../cartodb_services/test/test_helper.py      |  2 +-
 12 files changed, 58 insertions(+), 44 deletions(-)
 delete mode 100644 server/lib/python/cartodb_services/path

diff --git a/server/extension/cdb_dataservices_server--0.5.0--0.5.1.sql b/server/extension/cdb_dataservices_server--0.5.0--0.5.1.sql
index 647eae3..ca41e78 100644
--- a/server/extension/cdb_dataservices_server--0.5.0--0.5.1.sql
+++ b/server/extension/cdb_dataservices_server--0.5.0--0.5.1.sql
@@ -134,7 +134,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -165,7 +165,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -196,7 +196,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -227,7 +227,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -258,7 +258,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -289,7 +289,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -320,7 +320,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -351,7 +351,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -382,7 +382,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -413,7 +413,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -444,7 +444,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/cdb_dataservices_server--0.5.1.sql b/server/extension/cdb_dataservices_server--0.5.1.sql
index ad46cf6..e20e4a2 100644
--- a/server/extension/cdb_dataservices_server--0.5.1.sql
+++ b/server/extension/cdb_dataservices_server--0.5.1.sql
@@ -227,7 +227,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -278,7 +278,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -310,7 +310,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -395,7 +395,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -427,7 +427,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -459,7 +459,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -558,7 +558,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -589,7 +589,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -620,7 +620,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -651,7 +651,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -777,7 +777,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/sql/0.5.1/30_admin0.sql b/server/extension/sql/0.5.1/30_admin0.sql
index 395253b..a626e2a 100644
--- a/server/extension/sql/0.5.1/30_admin0.sql
+++ b/server/extension/sql/0.5.1/30_admin0.sql
@@ -5,7 +5,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/sql/0.5.1/40_admin1.sql b/server/extension/sql/0.5.1/40_admin1.sql
index 011514b..457fd6e 100644
--- a/server/extension/sql/0.5.1/40_admin1.sql
+++ b/server/extension/sql/0.5.1/40_admin1.sql
@@ -6,7 +6,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -38,7 +38,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/sql/0.5.1/50_namedplaces.sql b/server/extension/sql/0.5.1/50_namedplaces.sql
index 0ee069f..41fbd05 100644
--- a/server/extension/sql/0.5.1/50_namedplaces.sql
+++ b/server/extension/sql/0.5.1/50_namedplaces.sql
@@ -6,7 +6,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -38,7 +38,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -70,7 +70,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/sql/0.5.1/60_postalcodes.sql b/server/extension/sql/0.5.1/60_postalcodes.sql
index 35540a3..dfdc004 100644
--- a/server/extension/sql/0.5.1/60_postalcodes.sql
+++ b/server/extension/sql/0.5.1/60_postalcodes.sql
@@ -5,7 +5,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -36,7 +36,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -67,7 +67,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -98,7 +98,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/sql/0.5.1/70_ips.sql b/server/extension/sql/0.5.1/70_ips.sql
index 5b70606..c3c5c63 100644
--- a/server/extension/sql/0.5.1/70_ips.sql
+++ b/server/extension/sql/0.5.1/70_ips.sql
@@ -5,7 +5,7 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, username, orgname)
+    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
diff --git a/server/extension/test/0.5.0/expected/00_install_test.out b/server/extension/test/0.5.0/expected/00_install_test.out
index c61b0a2..f4a1873 100644
--- a/server/extension/test/0.5.0/expected/00_install_test.out
+++ b/server/extension/test/0.5.0/expected/00_install_test.out
@@ -19,7 +19,19 @@ SELECT cartodb.cdb_conf_setconf('redis_metadata_config', '{"redis_host": "localh
  
 (1 row)
 
-SELECT cartodb.cdb_conf_setconf('mapzen_conf', '{"app_key": "dummy_key"}');
+SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}');
+ cdb_conf_setconf 
+------------------
+ 
+(1 row)
+
+SELECT cartodb.cdb_conf_setconf('mapzen_conf', '{"routing_app_key": "dummy_key"}');
+ cdb_conf_setconf 
+------------------
+ 
+(1 row)
+
+SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/dev/null"}');
  cdb_conf_setconf 
 ------------------
  
diff --git a/server/extension/test/0.5.1/sql/00_install_test.sql b/server/extension/test/0.5.1/sql/00_install_test.sql
index 1a296de..142f8a3 100644
--- a/server/extension/test/0.5.1/sql/00_install_test.sql
+++ b/server/extension/test/0.5.1/sql/00_install_test.sql
@@ -12,8 +12,8 @@ CREATE EXTENSION cdb_dataservices_server;
 SELECT cartodb.cdb_conf_setconf('redis_metrics_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}');
 SELECT cartodb.cdb_conf_setconf('redis_metadata_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}');
 SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}');
-SELECT cartodb.cdb_conf_setconf('mapzen_conf', '{"app_key": "dummy_key"}');
-SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/var/log/postgresql/geocodings.log"}');
+SELECT cartodb.cdb_conf_setconf('mapzen_conf', '{"routing_app_key": "dummy_key"}');
+SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/dev/null"}');
 
 -- Mock the varnish invalidation function
 -- (used by cdb_geocoder tests)
diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
index d0670d7..75e4e6e 100644
--- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
+++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
@@ -69,8 +69,8 @@ class IsolinesRoutingConfig(ServiceConfig):
     def __init__(self, redis_connection, db_conn, username, orgname=None):
         super(IsolinesRoutingConfig, self).__init__(redis_connection, username,
                                              orgname)
-        db_config = ServicesDBConfig(db_conn)
         config = self.__get_user_config(username, orgname)
+        db_config = ServicesDBConfig(db_conn)
         filtered_config = {key: config[key] for key in self.ROUTING_CONFIG_KEYS if key in config.keys()}
         self.__parse_config(filtered_config, db_config)
 
@@ -136,9 +136,11 @@ class IsolinesRoutingConfig(ServiceConfig):
 
 class InternalGeocoderConfig(ServiceConfig):
 
-    def __init__(self, redis_connection, username, orgname=None):
+    def __init__(self, redis_connection, db_conn, username, orgname=None):
         super(InternalGeocoderConfig, self).__init__(redis_connection,
                                                      username, orgname)
+        db_config = ServicesDBConfig(db_conn)
+        self._log_path = db_config.geocoder_log_path
 
     @property
     def service_type(self):
@@ -156,6 +158,10 @@ class InternalGeocoderConfig(ServiceConfig):
     def geocoding_quota(self):
         return None
 
+    @property
+    def log_path(self):
+        return self._log_path
+
 
 class GeocoderConfig(ServiceConfig):
 
@@ -289,7 +295,7 @@ class GeocoderConfig(ServiceConfig):
 
     @property
     def cost_per_hit(self):
-        self._cost_per_hit
+        return self._cost_per_hit
 
     @property
     def log_path(self):
diff --git a/server/lib/python/cartodb_services/path b/server/lib/python/cartodb_services/path
deleted file mode 100644
index ce15f7f..0000000
--- a/server/lib/python/cartodb_services/path
+++ /dev/null
@@ -1,4 +0,0 @@
-{"geocoder_type": "geocoder_here", "username": "test_user", "processed_rows": 1, "successful_rows": 1, "cost": null, "kind": "high-resolution", "success": true, "processable_rows": 1, "created_at": "2016-03-08T14:51:54.316618", "real_rows": 1, "batched": false, "cache_hits": 0, "organization": "test_org", "used_credits": 0, "failed_rows": 0}
-{"geocoder_type": "geocoder_here", "username": "test_user", "processed_rows": 1, "successful_rows": 1, "cost": null, "kind": "high-resolution", "success": true, "processable_rows": 1, "created_at": "2016-03-08T14:51:54.318872", "real_rows": 1, "batched": false, "cache_hits": 0, "organization": "test_org", "used_credits": 0, "failed_rows": 0}
-{"geocoder_type": "geocoder_here", "username": "test_user", "processed_rows": 1, "successful_rows": 1, "cost": null, "kind": "high-resolution", "success": true, "processable_rows": 1, "created_at": "2016-03-08T14:51:54.322009", "real_rows": 1, "batched": false, "cache_hits": 0, "organization": null, "used_credits": 0, "failed_rows": 0}
-{"geocoder_type": "geocoder_here", "username": "test_user", "processed_rows": 1, "successful_rows": 1, "cost": null, "kind": "high-resolution", "success": true, "processable_rows": 1, "created_at": "2016-03-08T14:51:54.323941", "real_rows": 1, "batched": false, "cache_hits": 0, "organization": null, "used_credits": 0, "failed_rows": 0}
diff --git a/server/lib/python/cartodb_services/test/test_helper.py b/server/lib/python/cartodb_services/test/test_helper.py
index 7aaebd3..cc530c6 100644
--- a/server/lib/python/cartodb_services/test/test_helper.py
+++ b/server/lib/python/cartodb_services/test/test_helper.py
@@ -48,4 +48,4 @@ def _plpy_execute_side_effect(*args, **kwargs):
     elif args[0] == "SELECT cartodb.CDB_Conf_GetConf('mapzen_conf') as conf":
         return [{'conf': '{"routing_app_key": "app_key"}'}]
     elif args[0] == "SELECT cartodb.CDB_Conf_GetConf('logger_conf') as conf":
-        return [{'conf': '{"geocoder_log_path": "path"}'}]
+        return [{'conf': '{"geocoder_log_path": "/dev/null"}'}]