Skip to content

Always kill PM2 daemon when running site stop --all #2683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gcsecsey wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Always kill PM2 daemon when running site stop --all #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/cli/commands/site/stop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ export async function runCommand(
}

if ( ! runningSites.length ) {
logger.reportSuccess( __( 'No sites are currently running' ) );
await killDaemonAndChildrenAndExitProcess( () => {
logger.reportSuccess( __( 'No sites are currently running' ) );
} );
return;
}

Expand Down
10 changes: 4 additions & 6 deletions apps/cli/commands/site/tests/stop.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,16 @@ describe( 'CLI: studio site stop --all', () => {
} );

describe( 'Success Cases', () => {
it( 'should handle empty sites list', async () => {
it( 'should kill daemon even with empty sites list', async () => {
vi.mocked( readAppdata ).mockResolvedValue( { sites: [], snapshots: [] } );

await runCommand( Mode.STOP_ALL_SITES, undefined, false );

expect( connect ).toHaveBeenCalled();
expect( killDaemonAndChildrenAndExitProcess ).not.toHaveBeenCalled();
expect( disconnect ).toHaveBeenCalled();
expect( killDaemonAndChildrenAndExitProcess ).toHaveBeenCalledTimes( 1 );
} );

it( 'should skip if no sites are running', async () => {
it( 'should kill daemon even if no sites are running', async () => {
vi.mocked( readAppdata ).mockResolvedValue( { sites: testSites, snapshots: [] } );

vi.mocked( isServerRunning ).mockResolvedValue( undefined );
Expand All @@ -275,9 +274,8 @@ describe( 'CLI: studio site stop --all', () => {

expect( connect ).toHaveBeenCalled();
expect( isServerRunning ).toHaveBeenCalledTimes( 3 );
expect( killDaemonAndChildrenAndExitProcess ).not.toHaveBeenCalled();
expect( killDaemonAndChildrenAndExitProcess ).toHaveBeenCalledTimes( 1 );
expect( clearSiteLatestCliPid ).not.toHaveBeenCalled();
expect( disconnect ).toHaveBeenCalled();
} );

it( 'should handle single site', async () => {
Expand Down
10 changes: 0 additions & 10 deletions package-lock.json
View file
Open in desktop
Copy link
Contributor

@epeicher epeicher Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required?

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading