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

- fix off by one in logfile parsing 

- if we already have an exit status, the server is already dead.
This commit is contained in:
Willi Goesgens 2015-04-13 17:02:11 +02:00
parent 1fce9850b5
commit 25c99c5365
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,7 +437,7 @@ function readImportantLogLines(logPath) {
var maxBuffer = buf.length; var maxBuffer = buf.length;
for (j = 0; j < maxBuffer; j++) { for (j = 0; j < maxBuffer; j++) {
if (buf[j] === 10) { // \n if (buf[j] === 10) { // \n
var line = buf.asciiSlice(lineStart, j - 1); var line = buf.asciiSlice(lineStart, j);
// filter out regular INFO lines, and test related messages // filter out regular INFO lines, and test related messages
if ((line.search(" INFO ") < 0) && if ((line.search(" INFO ") < 0) &&
(line.search("WARNING about to execute:") < 0) && (line.search("WARNING about to execute:") < 0) &&
@ -465,6 +465,9 @@ function copy (src, dst) {
function checkInstanceAlive(instanceInfo, options) { function checkInstanceAlive(instanceInfo, options) {
var storeArangodPath; var storeArangodPath;
if (options.cluster === false) { if (options.cluster === false) {
if (instanceInfo.hasOwnProperty('exitStatus')) {
return false;
}
var res = statusExternal(instanceInfo.pid, false); var res = statusExternal(instanceInfo.pid, false);
var ret = res.status === "RUNNING"; var ret = res.status === "RUNNING";
if (! ret) { if (! ret) {