mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Fix stopping and retrying failed executions (#8480)

Browse source
This commit is contained in:
Iván Ovejero 2024-01-29 16:34:58 +01:00 committed by GitHub
parent 981ea3930e
commit 238b54c77b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/cli/src/databases/repositories/execution.repository.ts
View file

@ -649,6 +649,16 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
});
}
async findWithUnflattenedData(executionId: string, accessibleWorkflowIds: string[]) {
return await this.findSingleExecution(executionId, {
where: {
workflowId: In(accessibleWorkflowIds),
},
includeData: true,
unflattenData: true,
});
}
async findIfShared(executionId: string, sharedWorkflowIds: string[]) {
return await this.findSingleExecution(executionId, {
where: {

2
packages/cli/src/executions/active-execution.service.ts
View file

@ -104,7 +104,7 @@ export class ActiveExecutionService {
};
}
if (!this.isRegularMode) return await this.waitTracker.stopExecution(execution.id);
if (this.isRegularMode) return await this.waitTracker.stopExecution(execution.id);
// queue mode

4
packages/cli/src/executions/execution.service.ts
View file

@ -179,10 +179,10 @@ export class ExecutionService {
async retry(req: ExecutionRequest.Retry, sharedWorkflowIds: string[]) {
const { id: executionId } = req.params;
const execution = (await this.executionRepository.findIfShared(
const execution = await this.executionRepository.findWithUnflattenedData(
executionId,
sharedWorkflowIds,
)) as unknown as IExecutionResponse;
);
if (!execution) {
this.logger.info(