Merge branch 'master' into plugin-2

This commit is contained in:
Khaos Tian
2016-02-17 10:41:32 -08:00
3 changed files with 9 additions and 4 deletions

View File

@@ -22,7 +22,7 @@ module.exports = {
Server: Server
}
function Server() {
function Server(insecureAccess) {
// Setup Accessory Cache Storage
accessoryStorage.initSync({ dir: User.cachedAccessoryPath() });
@@ -49,6 +49,8 @@ function Server() {
this._setupManager.on('requestCurrentConfig', function(callback) {
callback(this._config);
}.bind(this));
this._allowInsecureAccess = insecureAccess || false;
}
Server.prototype.run = function() {
@@ -83,7 +85,7 @@ Server.prototype._publish = function() {
port: bridgeConfig.port || 51826,
pincode: bridgeConfig.pin || "031-45-154",
category: Accessory.Categories.BRIDGE
});
}, this._allowInsecureAccess);
log.info("Homebridge is running on port %s.", bridgeConfig.port || 51826);
}