mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Waiting workflows not stopping (#5811)

Browse source 
fix: Waiting workflows not stopping
This commit is contained in:
Val 2023-03-30 10:12:29 +01:00 committed by GitHub
parent 739b9b07f0
commit 744c3fd211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/cli/src/Interfaces.ts
View file

@ -165,7 +165,7 @@ export interface IExecutionBase {
// Data in regular format with references // Data in regular format with references
export interface IExecutionDb extends IExecutionBase { export interface IExecutionDb extends IExecutionBase {
data: IRunExecutionData; data: IRunExecutionData;
waitTill?: Date; waitTill?: Date | null;
workflowData?: IWorkflowBase; workflowData?: IWorkflowBase;
} }
@ -179,7 +179,7 @@ export interface IExecutionResponse extends IExecutionBase {
data: IRunExecutionData; data: IRunExecutionData;
retryOf?: string; retryOf?: string;
retrySuccessId?: string; retrySuccessId?: string;
waitTill?: Date; waitTill?: Date | null;
workflowData: IWorkflowBase; workflowData: IWorkflowBase;
} }

2
packages/cli/src/WaitTracker.ts
View file

@ -124,7 +124,7 @@ export class WaitTracker {
}; };
fullExecutionData.stoppedAt = new Date(); fullExecutionData.stoppedAt = new Date();
fullExecutionData.waitTill = undefined; fullExecutionData.waitTill = null;
fullExecutionData.status = 'canceled'; fullExecutionData.status = 'canceled';
await Db.collections.Execution.update( await Db.collections.Execution.update(

2
packages/cli/src/databases/entities/ExecutionEntity.ts
View file

@ -49,7 +49,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
workflowId: string; workflowId: string;
@Column({ type: datetimeColumnType, nullable: true }) @Column({ type: datetimeColumnType, nullable: true })
waitTill: Date; waitTill: Date | null;
@OneToMany('ExecutionMetadata', 'execution') @OneToMany('ExecutionMetadata', 'execution')
metadata: ExecutionMetadata[]; metadata: ExecutionMetadata[];

2
packages/workflow/src/Interfaces.ts
View file

@ -1547,7 +1547,7 @@ export interface IRun {
data: IRunExecutionData; data: IRunExecutionData;
finished?: boolean; finished?: boolean;
mode: WorkflowExecuteMode; mode: WorkflowExecuteMode;
waitTill?: Date; waitTill?: Date | null;
startedAt: Date; startedAt: Date;
stoppedAt?: Date; stoppedAt?: Date;
status: ExecutionStatus; status: ExecutionStatus;