From 1a15cb31f772aa73bb26a3ed0351628786b0a234 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 18 Sep 2024 12:36:44 +0100 Subject: [PATCH] Add WorkflowHostname configuration and update WorkflowService to use it --- Common/Server/EnvironmentConfig.ts | 6 ++++++ Common/Server/Services/WorkflowService.ts | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts index e9724cc75a6..f2dbf711e85 100644 --- a/Common/Server/EnvironmentConfig.ts +++ b/Common/Server/EnvironmentConfig.ts @@ -106,6 +106,12 @@ export const WorkerHostname: Hostname = Hostname.fromString( }`, ); +export const WorkflowHostname: Hostname = Hostname.fromString( + `${process.env["SERVER_WORKFLOW_HOSTNAME"] || "localhost"}:${ + process.env["WORKFLOW_PORT"] || 80 + }`, +); + export const HomeHostname: Hostname = Hostname.fromString( `${process.env["SERVER_HOME_HOSTNAME"] || "localhost"}:${ process.env["HOME_PORT"] || 80 diff --git a/Common/Server/Services/WorkflowService.ts b/Common/Server/Services/WorkflowService.ts index 6df0e8828b8..dd7a59f2705 100644 --- a/Common/Server/Services/WorkflowService.ts +++ b/Common/Server/Services/WorkflowService.ts @@ -1,4 +1,4 @@ -import { AppApiHostname } from "../EnvironmentConfig"; +import { WorkflowHostname } from "../EnvironmentConfig"; import ClusterKeyAuthorization from "../Middleware/ClusterKeyAuthorization"; import { OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; @@ -15,6 +15,7 @@ import { } from "../../Types/Workflow/Component"; import API from "Common/Utils/API"; import Model from "Common/Models/DatabaseModels/Workflow"; +import logger from "../Utils/Logger"; export class Service extends DatabaseService { public constructor() { @@ -63,11 +64,13 @@ export class Service extends DatabaseService { }); } + logger.debug("Updating workflow on the workflow service"); + await API.post( new URL( Protocol.HTTP, - AppApiHostname, - new Route("/api/workflow/update/" + onUpdate.updateBy.query._id!), + WorkflowHostname, + new Route("/workflow/update/" + onUpdate.updateBy.query._id!), ), {}, { @@ -75,6 +78,8 @@ export class Service extends DatabaseService { }, ); + logger.debug("Updated workflow on the workflow service"); + return onUpdate; } }