The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add workspace id in job logs (#19764)
Thomas Trompette446a3923f2a8
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.tsindex ae9bb553653..0f94e52594d 100644--- a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts+++ b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts@@ -111,16 +111,20 @@ export class BullMQDriverasync (job) => {// TODO: Correctly support for job.idconst timeStart = performance.now();+ const workspaceId = job.data?.workspaceId;+ const workspaceSuffix = workspaceId+ ? ` [workspace=${workspaceId}]`+ : '';this.logger.log(- `Processing job ${job.id} with name ${job.name} on queue ${queueName}`,+ `Processing job ${job.id} with name ${job.name} on queue ${queueName}${workspaceSuffix}`,);await handler({ data: job.data, id: job.id ?? '', name: job.name });const timeEnd = performance.now();const executionTime = timeEnd - timeStart;this.logger.log(- `Job ${job.id} with name ${job.name} processed on queue ${queueName} in ${executionTime.toFixed(2)}ms`,+ `Job ${job.id} with name ${job.name} processed on queue ${queueName} in ${executionTime.toFixed(2)}ms${workspaceSuffix}`,);},workerOptions,diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.tsindex 09f5afd463d..4d04fb9cc2b 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts@@ -1,4 +1,4 @@-import { Scope } from '@nestjs/common';+import { Logger, Scope } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';@@ -24,6 +24,8 @@ import { WorkflowTriggerType } from 'src/modules/workflow/workflow-trigger/types@Processor({ queueName: MessageQueue.workflowQueue, scope: Scope.REQUEST })export class RunWorkflowJob {+ private readonly logger = new Logger(RunWorkflowJob.name);+constructor(private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,private readonly codeStepBuildService: CodeStepBuildService,@@ -39,6 +41,9 @@ export class RunWorkflowJob {lastExecutedStepId,workspaceId,}: RunWorkflowJobData): Promise<void> {+ this.logger.log(+ `Running workflow run ${workflowRunId} in workspace ${workspaceId}`,+ );const authContext = buildSystemAuthContext(workspaceId);await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {