bug fixes

lab11 · Apr 17, 2016 · e2e75c5 · e2e75c5
1 parent bfaab16
commit e2e75c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/gateway/check-ip-address.js b/gateway/check-ip-address.js
@@ -8,8 +8,10 @@ function get_ip_addresses () {
 	var out = [];
 
 	for (var ifname in ifaces) {
-		if (ifname != lo) {
-			out.push(ifaces[ifname].address);
+		if (ifname != 'lo') {
+			for (var i=0; i<ifaces[ifname].length; i++) {
+				out.push(ifaces[ifname][i].address);
+			}
 		}
 	}
 	return out.join('|');

diff --git a/gateway/sensu-configure-client.js b/gateway/sensu-configure-client.js
@@ -4,7 +4,8 @@ var getmac = require('getmac');
 var exec   = require('child_process').exec;
 var fs     = require('fs');
 
-var CONFIG_FILENAME     = '/etc/sensu/conf.d/client.json';
+var RESTART_SENSU_CMD = 'pkill -9 sensu-client';
+var CONFIG_FILENAME   = '/etc/sensu/conf.d/client.json';
 
 var output = JSON.parse(fs.readFileSync(CONFIG_FILENAME));
 
@@ -13,17 +14,20 @@ function get_first_ip_address () {
 	var os = require('os');
 	var ifaces = os.networkInterfaces();
 
+	console.log(ifaces);
+
 	for (var ifname in ifaces) {
 		if (ifname != lo) {
-			return ifaces[ifname].address;
+			return ifaces[ifname][0].address;
 		}
 	}
 	return '';
 }
 
 if ('client' in output) {
 	getmac.getMac(function (err, addr) {
-		var name = 'swarm-gateway-' + addr;
+		var macaddr = adddr.replace(/[^A-Z0-9-]/ig, '');
+		var name = 'swarm-gateway-' + macaddr;
 
 		output['client']['name'] = name;
 		output['client']['address'] = get_first_ip_address();