mirror of https://gitee.com/bigwinds/arangodb
We can simplify extra arguments now that we work with objects for argv all over the place.
This commit is contained in:
parent
950e05787b
commit
feda1119b4
|
@ -271,27 +271,16 @@ function startInstance (protocol, options, addArgs, testname) {
|
|||
appDir = fs.join(tmpDataDir, "apps");
|
||||
fs.makeDirectoryRecursive(tmpDataDir);
|
||||
instanceInfo.tmpDataDir = tmpDataDir;
|
||||
var optionsExtraArgs = [];
|
||||
var optionsExtraArgs = {};
|
||||
if (typeof(options.extraargs) === 'object') {
|
||||
if (_.isArray(options.extraargs)) {
|
||||
optionsExtraArgs = options.extraargs;
|
||||
}
|
||||
else {
|
||||
optionsExtraArgs = optionsExtraArgs.concat(toArgv(options.extraargs));
|
||||
}
|
||||
}
|
||||
|
||||
var endpoint;
|
||||
var pos;
|
||||
var valgrindopts = {};
|
||||
if (typeof(options.valgrindargs) === 'object') {
|
||||
if (_.isArray(options.valgrindargs)) {
|
||||
valgrindopts = options.valgrindargs;
|
||||
}
|
||||
else {
|
||||
valgrindopts = _.extend(valgrindopts, options.valgrindargs);
|
||||
}
|
||||
}
|
||||
|
||||
var dispatcher;
|
||||
if (options.cluster) {
|
||||
|
|
Loading…
Reference in New Issue