X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=src%2Fmanager.js;h=b5eff7a3ecb88698beeb9d4bcc9364f4ccedacb7;hb=ad5e19413b7f003abc61d12a5ff9dbcf20065c65;hp=667fb301ef83d1abffb53b53470a25588f11d10d;hpb=d0444b4b0ee8166d911e6b227218d110eb7eddf1;p=websub-hub diff --git a/src/manager.js b/src/manager.js index 667fb30..b5eff7a 100644 --- a/src/manager.js +++ b/src/manager.js @@ -25,13 +25,6 @@ class Manager { this.db = db; this.options = options; this.communication = new Communication(logger, db, options); - - // Precalculate the invariant root GET metadata. - this.getRootContent = Template.rootHTML(undefined, options); - const now = new Date(); - this.startTimeString = now.toGMTString(); - this.startTimeMs = now.getTime(); - this.getRootETag = common.generateETag(undefined, undefined, this.getRootContent); } @@ -61,16 +54,8 @@ class Manager { const _scope = _fileScope('getRoot'); this.logger.debug(_scope, 'called', { ctx }); - res.setHeader(Enum.Header.LastModified, this.startTimeString); - res.setHeader(Enum.Header.ETag, this.getRootETag); - - if (common.isClientCached(req, this.startTimeMs, this.getRootETag)) { - this.logger.debug(_scope, 'client cached response', { ctx }); - res.statusCode = 304; - res.end(); - return; - } - res.end(this.getRootContent); + const content = Template.rootHTML(ctx, this.options); + res.end(content); this.logger.info(_scope, 'finished', { ctx }); } @@ -792,7 +777,7 @@ class Manager { * @param {object} ctx */ async processTasks(res, ctx) { - const _scope = _fileScope('getTopicDetails'); + const _scope = _fileScope('processTasks'); this.logger.debug(_scope, 'called', { ctx }); // N.B. no await on this