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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2013-07-26 15:21:49 +02:00
parent 1d0addcee0 56215083e0
commit 916c1bc685
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/client/modules/org/arangodb/foxx-manager.js
View File

@ -756,7 +756,7 @@ exports.unmount = function (key) {
var res = arango.POST("/_admin/foxx/unmount", JSON.stringify(req));
arangosh.checkRequestResult(res);
return { appdId: res.appId, mount: res.mount, collectionPrefix: res.collectionPrefix };
return { appId: res.appId, mount: res.mount, collectionPrefix: res.collectionPrefix };
};
////////////////////////////////////////////////////////////////////////////////

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

@ -438,6 +438,9 @@ function routingAalApp (app, mount, prefix, dev) {
collectionPrefix: prefix, // collection prefix
appModule: app.createAppModule(), // app module
isDevelopment: devel,
isProduction: ! devel,
routingInfo: {},
foxxes: []
};
@ -770,7 +773,7 @@ exports.appRoutes = function () {
routes.push(r);
console.log("mounted foxx app '%s' on '%s'", appId);
console.log("mounted foxx app '%s' on '%s'", appId, mount);
}
catch (err) {
console.error("cannot mount foxx app '%s': %s", appId, String(err.stack || err));

12
lib/V8/v8-utils.cpp
View File

@ -1933,7 +1933,7 @@ static v8::Handle<v8::Value> JS_SPrintF (v8::Arguments const& argv) {
case 'f':
case 'i': {
if (len <= p) {
string msg = string("not enough arguments for ") + *ptr;
string msg = string("not enough arguments for ") + *ptr + " in format '" + *format + "'";
TRI_V8_EXCEPTION_PARAMETER(scope, msg.c_str());
}
@ -1941,7 +1941,7 @@ static v8::Handle<v8::Value> JS_SPrintF (v8::Arguments const& argv) {
double f = TRI_ObjectToDouble(argv[p], e);
if (e) {
string msg = StringUtils::itoa(p) + ".th argument must be a number";
string msg = StringUtils::itoa(p) + ".th argument must be a number in format '" + *format + "'";
TRI_V8_EXCEPTION_PARAMETER(scope, msg.c_str());
}
@ -1964,14 +1964,14 @@ static v8::Handle<v8::Value> JS_SPrintF (v8::Arguments const& argv) {
case 'o':
case 's': {
if (len <= p) {
string msg = string("not enough arguments for ") + *ptr;
string msg = string("not enough arguments for ") + *ptr + " in format '" + *format + "'";
TRI_V8_EXCEPTION_PARAMETER(scope, msg.c_str());
}
TRI_Utf8ValueNFC text(TRI_UNKNOWN_MEM_ZONE, argv[p]);
if (*text == 0) {
string msg = StringUtils::itoa(p) + ".th argument must be a string";
string msg = StringUtils::itoa(p) + ".th argument must be a string in format '" + *format + "'";
TRI_V8_EXCEPTION_PARAMETER(scope, msg.c_str());
}
@ -1983,7 +1983,7 @@ static v8::Handle<v8::Value> JS_SPrintF (v8::Arguments const& argv) {
}
default: {
string msg = "found illegal format directive '" + string(1, *ptr) + "'";
string msg = "found illegal format directive '" + string(1, *ptr) + "' in format '" + *format + "'";
TRI_V8_EXCEPTION_PARAMETER(scope, msg.c_str());
}
}
@ -1997,7 +1997,7 @@ static v8::Handle<v8::Value> JS_SPrintF (v8::Arguments const& argv) {
TRI_Utf8ValueNFC text(TRI_UNKNOWN_MEM_ZONE, argv[i]);
if (*text == 0) {
string msg = StringUtils::itoa(i) + ".th argument must be a string";
string msg = StringUtils::itoa(i) + ".th argument must be a string in format '" + *format + "'";
TRI_V8_TYPE_ERROR(scope, msg.c_str());
}