pixl-config 1.0.10 → 1.0.13

package/config.js

@@ -164,6 +164,11 @@ var Config = module.exports = Class.create({
 		if (this.args) this.args.set(key, value);
 	},
 	
+	delete: function(key) {
+		// delete config key
+		delete this.config[key];
+	},
+	
 	import: function(hash) {
 		// import all keys/values from specified hash (shallow copy)
 		Tools.mergeHashInto( this.config, hash );
@@ -204,6 +209,14 @@ var Config = module.exports = Class.create({
 	
 	getHostname: function(callback) {
 		// determine server hostname
+		this.hostname = this.get('hostname');
+		if (this.hostname) {
+			// well that was easy
+			callback();
+			return;
+		}
+		
+		// try ENV vars next
 		this.hostname = (process.env['HOSTNAME'] || process.env['HOST'] || '').toLowerCase();
 		if (this.hostname) {
 			// well that was easy
@@ -234,9 +247,16 @@ var Config = module.exports = Class.create({
 		// determine server ip address
 		var self = this;
 		
-		// try OS networkInterfaces() first
+		// allow the config to override this
+		this.ip = this.get('ip');
+		if (this.ip) {
+			// well that was easy
+			callback();
+			return;
+		}
+		
+		// try OS networkInterfaces()
 		// find the first external IPv4 address that doesn't match 169.254.*
-		// (and preferably not 172.* either)
 		var ifaces = os.networkInterfaces();
 		var addrs = [];
 		for (var key in ifaces) {
@@ -248,14 +268,6 @@ var Config = module.exports = Class.create({
 		var iaddrs = Tools.findObjects( addrs, { family: 'IPv4', internal: false } );
 		for (var idx = 0, len = iaddrs.length; idx < len; idx++) {
 			var addr = iaddrs[idx];
-			
-			if (addr && addr.address && addr.address.match(/^\d+\.\d+\.\d+\.\d+$/) && !addr.address.match(/^(169\.254\.|172\.)/)) {
-				// found an interface that is not 169.254.* nor 172.* so prefer that
-				this.ip = addr.address;
-				callback();
-				return;
-			}
-			
 			if (addr && addr.address && addr.address.match(/^\d+\.\d+\.\d+\.\d+$/) && !addr.address.match(/^169\.254\./)) {
 				// found an interface that is not 169.254.* so go with that one
 				this.ip = addr.address;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-config",
-	"version": "1.0.10",
+	"version": "1.0.13",
 	"description": "A simple JSON configuration loader.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/pixl-config",
@@ -18,7 +18,7 @@
 		"config"
 	],
 	"dependencies": {
-		"pixl-class": "^1.0.0",
+		"pixl-class": "^1.0.3",
 		"pixl-args": "^1.0.0",
 		"pixl-tools": "^1.0.0"
 	},