Moved static files serving to its own file

pull/528/head
Egil Moeller 2012-02-24 20:45:02 +01:00
parent 1f2b52ba5a
commit 21300bd6c7
4 changed files with 26 additions and 20 deletions

View File

@ -72,6 +72,13 @@ log4js.setGlobalLogLevel(settings.loglevel);
async.waterfall([ async.waterfall([
plugins.update, plugins.update,
function (callback) {
console.log(["plugins", plugins.plugins]);
console.log(["parts", plugins.parts]);
console.log(["hooks", plugins.hooks]);
callback();
},
//initalize the database //initalize the database
function (callback) function (callback)
{ {
@ -147,19 +154,6 @@ async.waterfall([
gracefulShutdown(); gracefulShutdown();
}); });
//serve static files
app.get('/static/js/require-kernel.js', function (req, res, next) {
res.header("Content-Type","application/javascript; charset: utf-8");
res.write(minify.requireDefinition());
res.end();
});
app.get('/static/*', function(req, res)
{
var filePath = path.normalize(__dirname + "/.." +
req.url.replace(/\.\./g, '').split("?")[0]);
res.sendfile(filePath, { maxAge: exports.maxAge });
});
//serve minified files //serve minified files
app.get('/minified/:filename', minify.minifyJS); app.get('/minified/:filename', minify.minifyJS);

17
node/static.js Normal file
View File

@ -0,0 +1,17 @@
var path = require('path');
var minify = require('./utils/Minify');
exports.expressServer = function (hook_name, args, cb) {
//serve static files
args.app.get('/static/js/require-kernel.js', function (req, res, next) {
res.header("Content-Type","application/javascript; charset: utf-8");
res.write(minify.requireDefinition());
res.end();
});
args.app.get('/static/*', function(req, res)
{
var filePath = path.normalize(__dirname + "/.." +
req.url.replace(/\.\./g, '').split("?")[0]);
res.sendfile(filePath, { maxAge: exports.maxAge });
});
}

View File

@ -1,5 +0,0 @@
exports.expressServer = function (hook_name, args, cb) {
args.app.get('/testxx', function(req, res) {
res.send("<em>Testing testing</em>");
});
}

View File

@ -1,8 +1,8 @@
{ {
"parts": [{ "parts": [{
"name": "__builtin__", "name": "static",
"hooks": { "hooks": {
"expressServer": "../test:expressServer" "expressServer": "../static:expressServer"
} }
}] }]
} }