Skip to content

Commit

Permalink
fix(core): Replace throw with warning when deactivating a non-active …
Browse files Browse the repository at this point in the history
…workflow (n8n-io#6969)

Replaces a throw with a warning message instead, since the failure in
question is not serious enough to warrant stopping the application.
  • Loading branch information
flipswitchingmonkey authored Aug 18, 2023
1 parent 6422078 commit b6a00fe
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions packages/cli/src/ActiveWorkflowRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,10 @@ export class ActiveWorkflowRunner implements IWebhookManager {
// if it's active in memory then it's a trigger
// so remove from list of actives workflows
if (this.activeWorkflows.isActive(workflowId)) {
await this.activeWorkflows.remove(workflowId);
Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
const removalSuccess = await this.activeWorkflows.remove(workflowId);
if (removalSuccess) {
Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
}
}
}
}
7 changes: 5 additions & 2 deletions packages/core/src/ActiveWorkflows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,13 @@ export class ActiveWorkflows {
*
* @param {string} id The id of the workflow to deactivate
*/
async remove(id: string): Promise<void> {
async remove(id: string): Promise<boolean> {
if (!this.isActive(id)) {
// Workflow is currently not registered
throw new Error(
Logger.warn(
`The workflow with the id "${id}" is currently not active and can so not be removed`,
);
return false;
}

const workflowData = this.workflowData[id];
Expand Down Expand Up @@ -244,5 +245,7 @@ export class ActiveWorkflows {
}

delete this.workflowData[id];

return true;
}
}

0 comments on commit b6a00fe

Please sign in to comment.