diff --git a/extensions/web-base/www/app/extensions.js b/extensions/web-base/www/app/extensions.js index f5caa46..0a99b33 100644 --- a/extensions/web-base/www/app/extensions.js +++ b/extensions/web-base/www/app/extensions.js @@ -130,9 +130,9 @@ new Vue({ this.info = {}; fetch('/engine/extensions/' + extensionId + '/info').then(assertIsOk).then(getJson).then(function(info) { this.info = info; - return fetch('/engine/extensions/' + extensionId + '/readme'); - }.bind(this)).then(rejectIfNotOk).then(getResponseText).then(function(content) { - this.readme = content; + return fetch('/engine/extensions/' + extensionId + '/readme').then(rejectIfNotOk).then(getResponseText).then(function(content) { + this.readme = content; + }.bind(this), doNothing); }.bind(this)); } } diff --git a/extensions/web-base/www/app/utils.js b/extensions/web-base/www/app/utils.js index ba2c0c0..5f06de1 100644 --- a/extensions/web-base/www/app/utils.js +++ b/extensions/web-base/www/app/utils.js @@ -234,6 +234,9 @@ function rejectIfNotOk(response) { return Promise.reject(response.statusText); } +function doNothing() { +} + function insertTab(e) { var t = e && e.target; if (t && t.setRangeText) { diff --git a/lha/Engine.lua b/lha/Engine.lua index b8680ef..08f6ec2 100644 --- a/lha/Engine.lua +++ b/lha/Engine.lua @@ -564,12 +564,14 @@ return class.create(function(engine) self:loadExtensions() self:loadThings() self:loadThingValues() + logger:info('Engine started') self.startTime = os.time() self:publishEvent('startup') self:publishEvent('configuration') self:publishEvent('extensions') self:publishEvent('things') self:startHeartbeat() + logger:info('Engine heartbeat started') end function engine:stop() diff --git a/lha/restEngine.lua b/lha/restEngine.lua index e02adaf..3c655d9 100644 --- a/lha/restEngine.lua +++ b/lha/restEngine.lua @@ -121,6 +121,9 @@ local REST_EXTENSIONS = { manifest = extension:getManifest() } end, + config = function(exchange) + return exchange.attributes.extension:getConfiguration() + end, info = function(exchange) return exchange.attributes.extension:toJSON() end,