mirror of https://gitee.com/bigwinds/arangodb
- fix off by one in logfile parsing
- if we already have an exit status, the server is already dead.
This commit is contained in:
parent
1fce9850b5
commit
25c99c5365
|
@ -437,7 +437,7 @@ function readImportantLogLines(logPath) {
|
|||
var maxBuffer = buf.length;
|
||||
for (j = 0; j < maxBuffer; j++) {
|
||||
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
|
||||
if ((line.search(" INFO ") < 0) &&
|
||||
(line.search("WARNING about to execute:") < 0) &&
|
||||
|
@ -465,6 +465,9 @@ function copy (src, dst) {
|
|||
function checkInstanceAlive(instanceInfo, options) {
|
||||
var storeArangodPath;
|
||||
if (options.cluster === false) {
|
||||
if (instanceInfo.hasOwnProperty('exitStatus')) {
|
||||
return false;
|
||||
}
|
||||
var res = statusExternal(instanceInfo.pid, false);
|
||||
var ret = res.status === "RUNNING";
|
||||
if (! ret) {
|
||||
|
|
Loading…
Reference in New Issue