Merge branch 'main' into keyddb-config

sitespeedio · Jul 3, 2024 · b0ca9de · b0ca9de
2 parents 27db108 + ac9ff17
commit b0ca9de
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/testrunner/CHANGELOG.md b/testrunner/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Testrunner changelog (we do [semantic versioning](https://semver.org))
 
+## 0.2.1 - 2024-06-30
+### Fixed
+* Make sure we await adding things to the report queue [#55](https://github.com/sitespeedio/onlinetest/pull/55).
+* Catch errors in all queue [#54](https://github.com/sitespeedio/onlinetest/pull/54).
+
 ## 0.2.0 - 2024-06-26
 ### Added
 * Make removeOnComplete and removeOnFail in the queue configurable. If  you run a large installation with many many tests, you may want to increase the number of tests that will continue to live in the queue after the test has completed (removeOnComplete) [#35](https://github.com/sitespeedio/onlinetest/pull/35).

diff --git a/testrunner/package.json b/testrunner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitespeed.io/testrunner",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A test runner for sitespeed.io server.",
   "type": "module",
   "exports": "./app.js",

diff --git a/testrunner/src/queue/queuehandler.js b/testrunner/src/queue/queuehandler.js
@@ -56,6 +56,10 @@ class QueueHandler {
       }
     });
 
+    this.redis.on('error', error => {
+      logger.error('Error in KeyDB/Redis connection %s', error);
+    });
+
     // If the server comes online, lets tell it that we are ready
     this.redis.on('message', (channel, message) => {
       if (channel === 'server' && message === 'start') {

diff --git a/testrunner/src/testrunners/docker-testrunner.js b/testrunner/src/testrunners/docker-testrunner.js
@@ -99,7 +99,7 @@ export default async function runJob(job) {
       runTime = testResult.result.browsertime[0].info.timestamp;
     }
 
-    resultQueue.add(
+    await resultQueue.add(
       {
         result: testResult.result,
         id: job.id,

diff --git a/testrunner/src/testrunners/testrunner.js b/testrunner/src/testrunners/testrunner.js
@@ -47,7 +47,7 @@ export default async function runJob(job) {
       // The timestamp from Browsertime is more exact
       runTime = testResult.result.browsertime[0].info.timestamp;
     }
-    resultQueue.add(
+    await resultQueue.add(
       {
         result: testResult.result,
         id: job.id,