Merge 92fc2b8 into 7dd47a4

CatalysmsServerManager · Jul 1, 2020 · edf65c2 · edf65c2
2 parents 7dd47a4 + 92fc2b8
commit edf65c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/api/hooks/sdtdLogs/LoggingObject.js b/api/hooks/sdtdLogs/LoggingObject.js
@@ -93,15 +93,21 @@ class LoggingObject extends EventEmitter {
       return;
     }
 
+    console.log(result.logs);
+    console.log(result.logs.length);
+
+
     if (result.logs.length === 0) {
       this.emptyResponses++;
       if (this.emptyResponses > 5) {
-        // havn't found any responses in a while, so reset to 0 and try again from scratch
+        // haven't found any responses in a while, so reset to 0 and try again from scratch
         await this.setLastLogLine(0);
       }
-    } else {
+    }
+
+    if (result.lastLogLine) {
       // save the log line we found
-      await this.setLastLogLine(result.lastLogLine + 1);
+      await this.setLastLogLine(result.lastLogLine);
     }
 
     for (const newLog of result.logs) {

diff --git a/test/unit/hooks/sdtdlogs/LoggingObject.test.js b/test/unit/hooks/sdtdlogs/LoggingObject.test.js
@@ -167,7 +167,7 @@ describe('LoggingObject', function () {
         const emitSpy = sandbox.spy(loggingObject, 'emit');
 
         await loggingObject.handleCompletedJob(job, JSON.stringify(result));
-        expect(loggingObject.lastLogLine).to.equal(111);
+        expect(loggingObject.lastLogLine).to.equal(110);
         expect(loggingObject.emptyResponses).to.equal(0);
         expect(loggingObject.failed).to.equal(false);
         expect(loggingObject.slowmode).to.equal(false);
@@ -193,7 +193,7 @@ describe('LoggingObject', function () {
         const emitSpy = sandbox.spy(loggingObject, 'emit');
 
         await loggingObject.handleCompletedJob(job, JSON.stringify(result));
-        expect(loggingObject.lastLogLine).to.equal(111);
+        expect(loggingObject.lastLogLine).to.equal(110);
         expect(loggingObject.emptyResponses).to.equal(0);
         expect(loggingObject.failed).to.equal(false);
         expect(loggingObject.slowmode).to.equal(false);
@@ -219,7 +219,7 @@ describe('LoggingObject', function () {
         const emitSpy = sandbox.spy(loggingObject, 'emit');
 
         await loggingObject.handleCompletedJob(job, JSON.stringify(result));
-        expect(loggingObject.lastLogLine).to.equal(111);
+        expect(loggingObject.lastLogLine).to.equal(110);
         expect(loggingObject.emptyResponses).to.equal(0);
         expect(loggingObject.failed).to.equal(false);
         expect(loggingObject.slowmode).to.equal(false);