feat: Merge pull request #47 from pelias/interpolation

interpolation client config
pelias · Jan 12, 2017 · aafab12 · aafab12
2 parents 3f3b967 + 28ff0e7
commit aafab12
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/config/defaults.json b/config/defaults.json
@@ -23,6 +23,11 @@
       }
     }
   },
+  "interpolation": {
+    "client": {
+      "adapter": "null"
+    }
+  },
   "dbclient": {
     "statFrequency": 10000
   },

diff --git a/config/expected-deep.json b/config/expected-deep.json
@@ -28,6 +28,11 @@
       }
     }
   },
+  "interpolation": {
+    "client": {
+      "adapter": "null"
+    }
+  },
   "dbclient": {
     "statFrequency": 10000
   },

diff --git a/config/local.json b/config/local.json
@@ -1,4 +1,10 @@
 {
+  "interpolation": {
+    "client": {
+      "adapter": "http",
+      "host": "http://localhost:9999"
+    }
+  },
   "imports": {
     "geonames": {
       "datapath": "/media/hdd"

diff --git a/test/generate.js b/test/generate.js
@@ -89,6 +89,8 @@ module.exports.generate.local = function(test) {
     t.notDeepEqual(c, defaults, 'valid function');
     t.equal(typeof c.esclient, 'object', 'valid property');
     t.equal(Object.keys(c.esclient).length, 5, 'keep all default properties');
+    t.equal(c.interpolation.client.adapter, 'http', 'interpolation client');
+    t.equal(c.interpolation.client.host, 'http://localhost:9999', 'interpolation client');
     t.equal(c.imports.geonames.datapath, '/media/hdd', 'local paths');
     t.equal(c.imports.openstreetmap.datapath, '/media/hdd/osm/mapzen-metro', 'local paths');
     t.equal(c.imports.openstreetmap.import[0].filename, 'london.osm.pbf', 'local paths');