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

move all Container.get out of hook functions

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2025-01-28 15:39:13 +01:00
parent cdfa22593b
commit da0499e9bd
No known key found for this signature in database
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
View file

@ -236,6 +236,9 @@ function hookFunctionsFinalizeExecutionStatus(): IWorkflowExecuteHooks {
*/ */
function hookFunctionsSave(): IWorkflowExecuteHooks { function hookFunctionsSave(): IWorkflowExecuteHooks {
const logger = Container.get(Logger); const logger = Container.get(Logger);
const errorReporter = Container.get(ErrorReporter);
const executionRepository = Container.get(ExecutionRepository);
const workflowStaticDataService = Container.get(WorkflowStaticDataService);
const workflowStatisticsService = Container.get(WorkflowStatisticsService); const workflowStatisticsService = Container.get(WorkflowStatisticsService);
return { return {
workflowExecuteAfter: [ workflowExecuteAfter: [
@ -257,12 +260,12 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) { if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
// Workflow is saved so update in database // Workflow is saved so update in database
try { try {
await Container.get(WorkflowStaticDataService).saveStaticDataById( await workflowStaticDataService.saveStaticDataById(
this.workflowData.id, this.workflowData.id,
newStaticData, newStaticData,
); );
} catch (e) { } catch (e) {
Container.get(ErrorReporter).error(e); errorReporter.error(e);
logger.error( logger.error(
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`, `There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`,
@ -283,7 +286,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
* on the next pruning cycle after the grace period set by * on the next pruning cycle after the grace period set by
* `EXECUTIONS_DATA_HARD_DELETE_BUFFER`. * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
*/ */
await Container.get(ExecutionRepository).softDelete(this.executionId); await executionRepository.softDelete(this.executionId);
return; return;
} }
@ -301,7 +304,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
this.retryOf, this.retryOf,
); );
await Container.get(ExecutionRepository).hardDelete({ await executionRepository.hardDelete({
workflowId: this.workflowData.id, workflowId: this.workflowData.id,
executionId: this.executionId, executionId: this.executionId,
}); });
@ -361,6 +364,9 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
*/ */
function hookFunctionsSaveWorker(): IWorkflowExecuteHooks { function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
const logger = Container.get(Logger); const logger = Container.get(Logger);
const errorReporter = Container.get(ErrorReporter);
const externalHooks = Container.get(ExternalHooks);
const workflowStaticDataService = Container.get(WorkflowStaticDataService);
const workflowStatisticsService = Container.get(WorkflowStatisticsService); const workflowStatisticsService = Container.get(WorkflowStatisticsService);
return { return {
workflowExecuteAfter: [ workflowExecuteAfter: [
@ -380,12 +386,12 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) { if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
// Workflow is saved so update in database // Workflow is saved so update in database
try { try {
await Container.get(WorkflowStaticDataService).saveStaticDataById( await workflowStaticDataService.saveStaticDataById(
this.workflowData.id, this.workflowData.id,
newStaticData, newStaticData,
); );
} catch (e) { } catch (e) {
Container.get(ErrorReporter).error(e); errorReporter.error(e);
logger.error( logger.error(
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`, `There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
@ -435,7 +441,6 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
} }
}, },
async function (this: WorkflowHooks, fullRunData: IRun) { async function (this: WorkflowHooks, fullRunData: IRun) {
const externalHooks = Container.get(ExternalHooks);
try { try {
await externalHooks.run('workflow.postExecute', [ await externalHooks.run('workflow.postExecute', [
fullRunData, fullRunData,
@ -506,6 +511,7 @@ export function getWorkflowHooksWorkerMain(
workflowData: IWorkflowBase, workflowData: IWorkflowBase,
optionalParameters: IWorkflowHooksOptionalParameters = {}, optionalParameters: IWorkflowHooksOptionalParameters = {},
): WorkflowHooks { ): WorkflowHooks {
const executionRepository = Container.get(ExecutionRepository);
const hookFunctions = mergeHookFunctions( const hookFunctions = mergeHookFunctions(
hookFunctionsWorkflowEvents(), hookFunctionsWorkflowEvents(),
hookFunctionsPreExecute(), hookFunctionsPreExecute(),
@ -530,7 +536,7 @@ export function getWorkflowHooksWorkerMain(
* on the next pruning cycle after the grace period set by * on the next pruning cycle after the grace period set by
* `EXECUTIONS_DATA_HARD_DELETE_BUFFER`. * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
*/ */
await Container.get(ExecutionRepository).softDelete(this.executionId); await executionRepository.softDelete(this.executionId);
return; return;
} }
@ -540,7 +546,7 @@ export function getWorkflowHooksWorkerMain(
(fullRunData.status !== 'success' && !saveSettings.error); (fullRunData.status !== 'success' && !saveSettings.error);
if (!isManualMode && shouldNotSave && !fullRunData.waitTill) { if (!isManualMode && shouldNotSave && !fullRunData.waitTill) {
await Container.get(ExecutionRepository).hardDelete({ await executionRepository.hardDelete({
workflowId: this.workflowData.id, workflowId: this.workflowData.id,
executionId: this.executionId, executionId: this.executionId,
}); });