Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplified options

This commit is contained in:
Jan Steemann 2013-07-27 13:43:22 +02:00
parent 520d2b7294
commit 2a30b068bf
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/server/modules/org/arangodb/foxx-manager.js
View File

@ -258,7 +258,8 @@ function executeAppScript (app, name, mount, prefix) {
appModule: app.createAppModule(),
isDevelopment: devel,
isProduction: ! devel,
options: app._options
options: app._options,
basePath: root
};
var cp = appContext.collectionPrefix;
@ -471,9 +472,14 @@ function routingAalApp (app, mount, options) {
if (apps.hasOwnProperty(i)) {
var file = apps[i];
var devel = false;
var root;
if (app._id.substr(0,4) === "dev:") {
devel = true;
root = module.devAppPath();
}
else {
root = module.appPath();
}
// set up a context for the application start function
@ -486,6 +492,7 @@ function routingAalApp (app, mount, options) {
collectionPrefix: prefix, // collection prefix
appModule: app.createAppModule(), // app module
options: options,
basePath: root,
isDevelopment: devel,
isProduction: ! devel,

37
js/server/modules/org/arangodb/foxx.js
View File

@ -125,8 +125,6 @@ Application = function (context, options) {
}
}
this.isDevelopment = context.isDevelopment;
this.isProduction = context.isProduction;
this.helperCollection = {};
this.routingInfo.urlPrefix = urlPrefix;
@ -144,16 +142,14 @@ Application = function (context, options) {
action: {
callback: myMiddleware.stringRepresentation,
options: {
name: context.name,
version: context.version,
appId: context.appId,
mount: context.mount,
isDevelopment: context.isDevelopment,
isProduction: context.isProduction,
app: {
appId: context.appId,
name: context.name,
version: context.version,
mount: context.mount,
prefix: context.prefix,
options: context.options
}
prefix: context.prefix,
options: context.options
}
}
}
@ -409,7 +405,7 @@ _.extend(Application.prototype, {
this.routingInfo.middleware.push({
url: {match: path},
action: {
callback: "function (req, res, opts, next) { " + String(func) + "(req, res); next(); }"
callback: "(function (req, res, opts, next) { (" + String(func) + "(req, res, opts)); next(); })"
}
});
},
@ -442,7 +438,7 @@ _.extend(Application.prototype, {
this.routingInfo.middleware.push({
url: {match: path},
action: {
callback: "function (req, res, opts, next) { next(); " + String(func) + "(req, res); }"
callback: "(function (req, res, opts, next) { next(); (" + String(func) + "(req, res, opts)); })"
}
});
},
@ -855,35 +851,34 @@ BaseMiddleware = function (templateCollection, helperCollection) {
};
var trace = options.isDevelopment;
if (!trace && options.hasOwnProperty("app") && options.app.hasOwnProperty("options")) {
trace = options.app.options.trace;
if (!trace && options.hasOwnProperty("options")) {
trace = options.options.trace;
}
if (trace) {
console.log("%s, incoming request from %s: %s",
options.app.mount,
options.mount,
request.client.address,
actions.stringifyRequestAddress(request));
}
request = _.extend(request, requestFunctions);
response = _.extend(response, responseFunctions);
_.extend(request, requestFunctions);
_.extend(response, responseFunctions);
next();
if (trace) {
if (response.hasOwnProperty("body")) {
console.log("%s, outgoing response of type %s, body length: %d",
options.app.mount,
options.mount,
response.contentType,
parseInt(response.body.length, 10));
} else if (response.hasOwnProperty("bodyFromFile")) {
console.log("%s, outgoing response of type %s, body file: %s",
options.app.mount,
options.mount,
response.contentType,
response.bodyFromFile);
} else {
console.log("%s, outgoing response of type %s, no body",
options.app.mount,
options.mount,
response.contentType);
}
}