From 1adebca5126521a50f515c4d20efa9a5565ea54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 27 May 2024 19:27:02 +0100 Subject: [PATCH] fix: stop changing `logs` if flusher is not set (#5676) --- packages/build/src/log/logger.ts | 2 +- packages/build/src/steps/core_step.ts | 4 ++-- packages/build/src/steps/plugin.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/build/src/log/logger.ts b/packages/build/src/log/logger.ts index 385bed4da1..2aa7823588 100644 --- a/packages/build/src/log/logger.ts +++ b/packages/build/src/log/logger.ts @@ -190,7 +190,7 @@ export const getSystemLogger = function ( return (...args) => fileDescriptor.write(`${reduceLogLines(args)}\n`) } -export const addOutputGate = (logs: Logs, outputFlusher: OutputFlusher): Logs => { +export const addOutputFlusher = (logs: Logs, outputFlusher: OutputFlusher): Logs => { if (logsAreBuffered(logs)) { return { ...logs, diff --git a/packages/build/src/steps/core_step.ts b/packages/build/src/steps/core_step.ts index cfaab75cb2..f72d132ed9 100644 --- a/packages/build/src/steps/core_step.ts +++ b/packages/build/src/steps/core_step.ts @@ -1,6 +1,6 @@ import { setEnvChanges } from '../env/changes.js' import { addErrorInfo, isBuildError } from '../error/info.js' -import { addOutputGate } from '../log/logger.js' +import { addOutputFlusher } from '../log/logger.js' import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js' @@ -40,7 +40,7 @@ export const fireCoreStep = async function ({ deployId, outputFlusher, }) { - const logsA = addOutputGate(logs, outputFlusher) + const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs try { const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]) diff --git a/packages/build/src/steps/plugin.js b/packages/build/src/steps/plugin.js index 50e4eabc8b..1f468d4f17 100644 --- a/packages/build/src/steps/plugin.js +++ b/packages/build/src/steps/plugin.js @@ -1,7 +1,7 @@ import { context, propagation } from '@opentelemetry/api' import { addErrorInfo } from '../error/info.js' -import { addOutputGate } from '../log/logger.js' +import { addOutputFlusher } from '../log/logger.js' import { logStepCompleted } from '../log/messages/ipc.js' import { pipePluginOutput, unpipePluginOutput } from '../log/stream.js' import { callChild } from '../plugins/ipc.js' @@ -43,7 +43,7 @@ export const firePluginStep = async function ({ const otelCarrier = {} propagation.inject(context.active(), otelCarrier) - const logsA = addOutputGate(logs, outputFlusher) + const logsA = addOutputFlusher(logs, outputFlusher) try { const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath])