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

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

This commit is contained in:
Jan Steemann 2014-02-17 17:46:07 +01:00
parent 73aa8226e3 8ff2964c63
commit 23c303da43
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/RestServer/ConsoleThread.cpp
View File

@ -93,6 +93,10 @@ void ConsoleThread::run () {
_applicationV8->exitContext(_context);
_done = 1;
}
catch (const char*) {
_applicationV8->exitContext(_context);
_done = 1;
}
catch (...) {
_applicationV8->exitContext(_context);
_done = 1;
@ -141,8 +145,8 @@ void ConsoleThread::inner () {
}
if (input == 0) {
_applicationServer->beginShutdown();
_userAborted = true;
_applicationServer->beginShutdown();
// this will be caught by "run"
throw "user aborted";

33
js/server/modules/org/arangodb/testing.js
View File

@ -395,6 +395,11 @@ function waitForCompletion (pid) {
return stat.exit;
}
function executeAndWait (cmd, args) {
var pid = executeExternal(cmd, args);
return statusExternal(pid, true).exit;
}
testFuncs.shell_client = function(options) {
var topDir = fs.normalize(fs.join(ArangoServerState.executablePath(),
"..",".."));
@ -413,8 +418,7 @@ testFuncs.shell_client = function(options) {
args.push(fs.join(topDir,te));
var arangosh = fs.normalize(fs.join(ArangoServerState.executablePath(),
"..","arangosh"));
var pid = executeExternal(arangosh, args);
results[te] = waitForCompletion(pid);
results[te] = executeAndWait(arangosh, args);
args.pop();
if (r !== 0 && !options.force) {
break;
@ -430,14 +434,23 @@ testFuncs.config = function (options) {
var topDir = fs.normalize(fs.join(ArangoServerState.executablePath(),
"..",".."));
var results = {};
var pid, r;
pid = executeExternal(fs.join(topDir,"bin","arangod"),
["--configuration",
fs.join(topDir,"etc","arangodb","arangod.conf"),
"--help"]);
r = waitForCompletion(pid);
results.arangod = r;
print("Config test arangod...",r);
var ts = ["arangod", "arangob", "arangodump", "arangoimp", "arangorestore",
"arangosh"];
var t;
for (i = 0; i < ts.length; i++) {
t = ts[i];
results[t] = executeAndWait(fs.join(topDir,"bin",t),
["--configuration", fs.join(topDir,"etc","arangodb",t+".conf"),
"--help"]);
print("Config test "+t+"...",results[t]);
}
for (i = 0; i < ts.length; i++) {
t = ts[i];
results[t+"_rel"] = executeAndWait(fs.join(topDir,"bin",t),
["--configuration", fs.join(topDir,"etc","relative",
t+".conf"), "--help"]);
print("Config test "+t+" (relative)...",results[t+"_rel"]);
}
return results;
};