public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow caching up to a week

pull/35/head
Peter 'Pita' Martischka 2011-05-28 20:43:00 +01:00
parent 537fca9ca4
commit 4eccf72baa
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/minify.js
View File

@ -7,6 +7,7 @@ var pro = require("uglify-js").uglify;
var path = require('path'); var path = require('path');
var Buffer = require('buffer').Buffer; var Buffer = require('buffer').Buffer;
var gzip = require('gzip'); var gzip = require('gzip');
var server = require('./server');
/** /**
* Answers a http request for the pad javascript * Answers a http request for the pad javascript
@ -201,7 +202,7 @@ exports.padJS = function(req, res)
pathStr = path.normalize(__dirname + "/../var/minified_pad.js"); pathStr = path.normalize(__dirname + "/../var/minified_pad.js");
} }
res.sendfile(pathStr); res.sendfile(pathStr, { maxAge: server.maxAge });
}) })
} }
//minifying is disabled, so load the files with jquery //minifying is disabled, so load the files with jquery

12
node/server.js
View File

@ -25,6 +25,8 @@ var path = require('path');
var minify = require('./minify'); var minify = require('./minify');
var serverName = "Etherpad-Lite ( http://j.mp/ep-lite )"; var serverName = "Etherpad-Lite ( http://j.mp/ep-lite )";
//cache a week
exports.maxAge = 1000*60*60*24*7;
async.waterfall([ async.waterfall([
//initalize the database //initalize the database
@ -47,7 +49,7 @@ async.waterfall([
{ {
res.header("Server", serverName); res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/.." + req.url.split("?")[0]); var filePath = path.normalize(__dirname + "/.." + req.url.split("?")[0]);
res.sendfile(filePath, { maxAge: 1000*60*60 }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve minified files //serve minified files
@ -72,7 +74,7 @@ async.waterfall([
{ {
res.header("Server", serverName); res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/../static/pad.html"); var filePath = path.normalize(__dirname + "/../static/pad.html");
res.sendfile(filePath, { maxAge: 1000*60*60 }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve index.html under / //serve index.html under /
@ -80,7 +82,7 @@ async.waterfall([
{ {
res.header("Server", serverName); res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/../static/index.html"); var filePath = path.normalize(__dirname + "/../static/index.html");
res.sendfile(filePath, { maxAge: 1000*60*60 }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve robots.txt //serve robots.txt
@ -88,7 +90,7 @@ async.waterfall([
{ {
res.header("Server", serverName); res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/../static/robots.txt"); var filePath = path.normalize(__dirname + "/../static/robots.txt");
res.sendfile(filePath, { maxAge: 1000*60*60 }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve favicon.ico //serve favicon.ico
@ -96,7 +98,7 @@ async.waterfall([
{ {
res.header("Server", serverName); res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/../static/favicon.ico"); var filePath = path.normalize(__dirname + "/../static/favicon.ico");
res.sendfile(filePath, { maxAge: 1000*60*60 }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//let the server listen //let the server listen