From b553236620c758abb6573be040a0398d06b0735f Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak
Date: Fri, 10 Feb 2017 21:18:09 -0700
Subject: [PATCH] Better defaults if cache buster read fails
---
src/meta/cacheBuster.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/meta/cacheBuster.js b/src/meta/cacheBuster.js
index ca00fba057..461bcaf801 100644
--- a/src/meta/cacheBuster.js
+++ b/src/meta/cacheBuster.js
@@ -32,15 +32,15 @@ exports.read = function read(callback) {
fs.readFile(filePath, function (err, buffer) {
if (err) {
winston.warn('[cache-buster] could not read cache buster: ' + err.message);
- return callback();
+ return callback(null, generate());
}
- buffer = buffer.toString();
- if (buffer) {
- cached = buffer;
- return callback(null, cached);
+ if (!buffer || buffer.toString().length !== 11) {
+ winston.warn('[cache-buster] cache buster string invalid: expected /[a-z0-9]{11}/, got `' + buffer + '`');
+ return callback(null, generate());
}
- callback();
+ cached = buffer.toString();
+ callback(null, cached);
});
};