From 5b11322bcf801e5d6aa526868751876bcaa952a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ey=C3=BE=C3=B3r=20Magn=C3=BAsson?= Date: Thu, 31 Jan 2019 16:30:11 +0100 Subject: [PATCH 1/2] fix(server): ensure log entries have level silly (#496) After recent changes to the logger, child entries only inherit their parent level if specified. --- garden-service/src/server/commands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/garden-service/src/server/commands.ts b/garden-service/src/server/commands.ts index b6297e0b17..5c1787c5dd 100644 --- a/garden-service/src/server/commands.ts +++ b/garden-service/src/server/commands.ts @@ -71,7 +71,7 @@ export async function resolveRequest( const cmdGarden = await Garden.factory(garden.projectRoot, garden.opts) // We generally don't want actions to log anything in the server. - const cmdLog = log.placeholder(LogLevel.silly) + const cmdLog = log.placeholder(LogLevel.silly, { preserveLevel: true }) const cmdArgs = mapParams(ctx, request.parameters, command.arguments) const cmdOpts = mapParams(ctx, request.parameters, command.options) From 0b3efabbe763f03363ccb5ad8c68cfccc225639a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ey=C3=BE=C3=B3r=20Magn=C3=BAsson?= Date: Thu, 31 Jan 2019 16:35:13 +0100 Subject: [PATCH 2/2] refactor(logger): rename preserveLevel opt to childEntriesInheritLevel Really it should just be `bequeathLevel`. --- garden-service/src/commands/logs.ts | 2 +- garden-service/src/logger/log-entry.ts | 6 +++--- garden-service/src/server/commands.ts | 2 +- garden-service/test/logger/log-entry.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/garden-service/src/commands/logs.ts b/garden-service/src/commands/logs.ts index f25e23be0e..a789f098b1 100644 --- a/garden-service/src/commands/logs.ts +++ b/garden-service/src/commands/logs.ts @@ -95,7 +95,7 @@ export class LogsCommand extends Command { }) await Bluebird.map(services, async (service: Service) => { - const voidLog = log.placeholder(LogLevel.silly, { preserveLevel: true }) + const voidLog = log.placeholder(LogLevel.silly, { childEntriesInheritLevel: true }) const status = await garden.actions.getServiceStatus({ log: voidLog, service, hotReload: false }) if (status.state === "ready" || status.state === "outdated") { diff --git a/garden-service/src/logger/log-entry.ts b/garden-service/src/logger/log-entry.ts index fb0e0acdef..3a579514b5 100644 --- a/garden-service/src/logger/log-entry.ts +++ b/garden-service/src/logger/log-entry.ts @@ -31,7 +31,7 @@ export interface UpdateOpts { error?: GardenError status?: EntryStatus indent?: number - preserveLevel?: boolean + childEntriesInheritLevel?: boolean } export interface CreateOpts extends UpdateOpts { @@ -110,9 +110,9 @@ export class LogEntry extends LogNode { ...resolveParam(param), } - // If preserveLevel is set to true, all children must have a level geq the level + // If childEntriesInheritLevel is set to true, all children must have a level geq the level // of the parent entry that set the flag. - const parentWithPreserveFlag = findParentEntry(this, entry => !!entry.opts.preserveLevel) + const parentWithPreserveFlag = findParentEntry(this, entry => !!entry.opts.childEntriesInheritLevel) const childLevel = parentWithPreserveFlag ? Math.max(parentWithPreserveFlag.level, level) : level return new LogEntry({ diff --git a/garden-service/src/server/commands.ts b/garden-service/src/server/commands.ts index 5c1787c5dd..1db02d85f6 100644 --- a/garden-service/src/server/commands.ts +++ b/garden-service/src/server/commands.ts @@ -71,7 +71,7 @@ export async function resolveRequest( const cmdGarden = await Garden.factory(garden.projectRoot, garden.opts) // We generally don't want actions to log anything in the server. - const cmdLog = log.placeholder(LogLevel.silly, { preserveLevel: true }) + const cmdLog = log.placeholder(LogLevel.silly, { childEntriesInheritLevel: true }) const cmdArgs = mapParams(ctx, request.parameters, command.arguments) const cmdOpts = mapParams(ctx, request.parameters, command.options) diff --git a/garden-service/test/logger/log-entry.ts b/garden-service/test/logger/log-entry.ts index 40a2e5cf1e..4e53066f95 100644 --- a/garden-service/test/logger/log-entry.ts +++ b/garden-service/test/logger/log-entry.ts @@ -41,9 +41,9 @@ describe("LogEntry", () => { ] expect(indents).to.eql([undefined, 1, 2, 3, 2, 3]) }) - context("preserveLevel is set to true", () => { + context("childEntriesInheritLevel is set to true", () => { it("should create a log entry whose children inherit the parent level", () => { - const verbose = logger.verbose({ preserveLevel: true }) + const verbose = logger.verbose({ childEntriesInheritLevel: true }) const error = verbose.error("") const silly = verbose.silly("") const deepError = error.error("")