Fixes yarn rw jobs clear command (#11578)

Closes #11577 --------- Co-authored-by: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com>
redwoodjs · Sep 19, 2024 · d27b0ce · d27b0ce
1 parent 0081d3a
commit d27b0ce
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.changesets/11578.md b/.changesets/11578.md
@@ -0,0 +1 @@
+- Fixes `yarn rw jobs clear` command (#11578) by @cannikin
diff --git a/packages/jobs/src/bins/__tests__/rw-jobs.test.ts b/packages/jobs/src/bins/__tests__/rw-jobs.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { mockLogger } from '../../core/__tests__/mocks.js'
-import { buildNumWorkers, startWorkers } from '../rw-jobs.js'
+import { buildNumWorkers, clearQueue, startWorkers } from '../rw-jobs.js'
 
 vi.mock('@redwoodjs/cli-helpers/loadEnvFiles', () => {
   return {
@@ -123,3 +123,24 @@ describe('startWorkers()', () => {
     )
   })
 })
+
+describe('clearQueue()', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+  })
+
+  it('forks a single worker', () => {
+    const mockWorker = {
+      on: () => {},
+    }
+    mocks.fork.mockImplementation(() => mockWorker)
+
+    clearQueue({ logger: mockLogger })
+
+    // single worker only
+    expect(mocks.fork).toHaveBeenCalledWith(
+      expect.stringContaining('rw-jobs-worker.js'),
+      ['--clear', '--index', '0', '--id', '0'],
+    )
+  })
+})
diff --git a/packages/jobs/src/bins/rw-jobs.ts b/packages/jobs/src/bins/rw-jobs.ts
@@ -29,6 +29,8 @@ setupEnv()
 
 process.title = 'rw-jobs'
 
+const WORKER_PATH = path.join(__dirname, 'rw-jobs-worker.js')
+
 const parseArgs = (argv: string[]) => {
   const commandString = hideBin(argv)
 
@@ -125,7 +127,7 @@ export const startWorkers = ({
     }
 
     // fork the worker process
-    const worker = fork(path.join(__dirname, 'rw-jobs-worker.js'), workerArgs, {
+    const worker = fork(WORKER_PATH, workerArgs, {
       detached: detach,
       stdio: detach ? 'ignore' : 'inherit',
       env: process.env,
@@ -143,7 +145,7 @@ export const startWorkers = ({
 }
 
 // TODO add support for stopping with SIGTERM or SIGKILL?
-const stopWorkers = async ({
+export const stopWorkers = async ({
   numWorkers,
   signal = 'SIGINT',
   logger,
@@ -174,9 +176,9 @@ const stopWorkers = async ({
   }
 }
 
-const clearQueue = ({ logger }: { logger: BasicLogger }) => {
+export const clearQueue = ({ logger }: { logger: BasicLogger }) => {
   logger.warn(`Starting worker to clear job queue...`)
-  fork(path.join(__dirname, 'rw-jobs-worker.js'), ['--clear'])
+  fork(WORKER_PATH, ['--clear', '--index', '0', '--id', '0'])
 }
 
 const signalSetup = ({