Workaround for bizarre issue #70

Cannot reproduce locally -- could be an issue with Node 9 on Ubuntu 16 only.
jhuckaby · Jul 4, 2018 · 228b6b3 · 228b6b3
1 parent 70444c2
commit 228b6b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bin/storage-cli.js b/bin/storage-cli.js
@@ -69,7 +69,9 @@ var ip = '';
 var ifaces = os.networkInterfaces();
 var addrs = [];
 for (var key in ifaces) {
-	addrs = addrs.concat( addrs, ifaces[key] );
+	if (ifaces[key] && ifaces[key].length) {
+		Array.from(ifaces[key]).forEach( function(item) { addrs.push(item); } );
+	}
 }
 var addr = Tools.findObject( addrs, { family: 'IPv4', internal: false } );
 if (addr && addr.address && addr.address.match(/^\d+\.\d+\.\d+\.\d+$/)) {

diff --git a/lib/discovery.js b/lib/discovery.js
@@ -139,7 +139,9 @@ module.exports = Class.create({
 		var ifaces = os.networkInterfaces();
 		var addrs = [];
 		for (var key in ifaces) {
-			addrs = addrs.concat( addrs, ifaces[key] );
+			if (ifaces[key] && ifaces[key].length) {
+				Array.from(ifaces[key]).forEach( function(item) { addrs.push(item); } );
+			}
 		}
 		var addr = Tools.findObject( addrs, { family: 'IPv4', internal: false } );
 		if (addr && addr.address && addr.address.match(/^\d+\.\d+\.\d+\.\d+$/) && addr.netmask && addr.netmask.match(/^\d+\.\d+\.\d+\.\d+$/)) {