fallback to address if service address is empty (#1)

* When using external services, we may have a node Address without a ServiceAddress. In that instance, we should fall back to the Address to avoid returning an empty string.
bobthemighty · Dec 19, 2017 · 2a4aa13 · 2a4aa13
1 parent ac8fa13
commit 2a4aa13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -143,7 +143,7 @@ function _Service (name, opts) {
       var prev = target[key];
       if (res.statusCode == 200 && data.length) {
         var item = data[Math.floor(Math.random()*data.length)]
-        Object.assign(target[key], new _ServiceValue(item.ServiceAddress, item.ServicePort));
+        Object.assign(target[key], new _ServiceValue(item.ServiceAddress || item.Address, item.ServicePort));
         builderOpts.emitter.emit('change', varname, item, prev);
       } else {
         builderOpts.log.warn('No data returned from consul for service '+_service);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "12factorial",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/bobthemighty/12factorial"