From ad09ca187e410741e705528f70c969a50402091f Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Thu, 1 Feb 2024 10:18:57 +0100 Subject: [PATCH] Zinnia started -> {Spark,Voyager} started --- .github/workflows/ci.yml | 7 +++++-- lib/zinnia.js | 6 ++++-- test/station.js | 9 ++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89cac48c..9df437b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,5 +92,8 @@ jobs: sleep 10 # Wait for Station modules to start docker logs station - - name: Check | Zinnia started - run: docker logs station | grep "Zinnia started" + - name: Check | Spark started + run: docker logs station | grep "Spark started" + + - name: Check | Voyager started + run: docker logs station | grep "Voyager started" diff --git a/lib/zinnia.js b/lib/zinnia.js index 78f67739..7041aca2 100644 --- a/lib/zinnia.js +++ b/lib/zinnia.js @@ -260,7 +260,8 @@ async function handleEvents ({ case 'activity:info': onActivity({ type: 'info', - message: event.message.replace(/Module Runtime/, 'Zinnia'), + message: + event.message.replace(/Module Runtime/, capitalize(module)), source: event.module }) break @@ -268,7 +269,8 @@ async function handleEvents ({ case 'activity:error': onActivity({ type: 'error', - message: event.message.replace(/Module Runtime/, 'Zinnia'), + message: + event.message.replace(/Module Runtime/, capitalize(module)), source: event.module }) break diff --git a/test/station.js b/test/station.js index df2fb556..bbf91859 100644 --- a/test/station.js +++ b/test/station.js @@ -12,7 +12,8 @@ describe('Station', () => { const ps = startStation() await Promise.all([ streamMatch(ps.stdout, 'totalJobsCompleted'), - streamMatch(ps.stdout, 'Zinnia started') + streamMatch(ps.stdout, 'Spark started'), + streamMatch(ps.stdout, 'Voyager started') ]) stopStation() }) @@ -28,7 +29,8 @@ describe('Station', () => { const ps = startStation() await Promise.all([ streamMatch(ps.stdout, 'totalJobsCompleted'), - streamMatch(ps.stdout, 'Zinnia started') + streamMatch(ps.stdout, 'Spark started'), + streamMatch(ps.stdout, 'Voyager started') ]) stopStation() }) @@ -37,7 +39,8 @@ describe('Station', () => { await Promise.all([ streamMatch(ps.stdout, 'jobs-completed'), - streamMatch(ps.stdout, /activity:info.*(Zinnia started)/) + streamMatch(ps.stdout, /activity:info.*(Spark started)/), + streamMatch(ps.stdout, /activity:info.*(Voyager started)/) ]) stopStation()