From eaef3225754772b6fe45dd04ef1cf87ca3c0f053 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Fri, 2 Jun 2023 16:48:11 +0000 Subject: [PATCH 1/2] hotfix(agent): only retain 1 logfile at a time --- cli/agent.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/agent.go b/cli/agent.go index aae59dc4e575b..5061e686b334e 100644 --- a/cli/agent.go +++ b/cli/agent.go @@ -66,8 +66,9 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd { // of zombie processes. if reaper.IsInitProcess() && !noReap && isLinux { logWriter := &lumberjack.Logger{ - Filename: filepath.Join(logDir, "coder-agent-init.log"), - MaxSize: 5, // MB + Filename: filepath.Join(logDir, "coder-agent-init.log"), + MaxSize: 5, // MB + MaxBackups: 1, } defer logWriter.Close() @@ -144,8 +145,9 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd { go DumpHandler(ctx) ljLogger := &lumberjack.Logger{ - Filename: filepath.Join(logDir, "coder-agent.log"), - MaxSize: 5, // MB + Filename: filepath.Join(logDir, "coder-agent.log"), + MaxSize: 5, // MB + MaxBackups: 1, } defer ljLogger.Close() logWriter := &closeWriter{w: ljLogger} From 8b4d553983b41d1cd8075c5eb54d7c56abd3b6a3 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Fri, 2 Jun 2023 17:13:42 +0000 Subject: [PATCH 2/2] fixup! hotfix(agent): only retain 1 logfile at a time --- cli/agent.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/agent.go b/cli/agent.go index 5061e686b334e..c7e41df9751e7 100644 --- a/cli/agent.go +++ b/cli/agent.go @@ -66,8 +66,9 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd { // of zombie processes. if reaper.IsInitProcess() && !noReap && isLinux { logWriter := &lumberjack.Logger{ - Filename: filepath.Join(logDir, "coder-agent-init.log"), - MaxSize: 5, // MB + Filename: filepath.Join(logDir, "coder-agent-init.log"), + MaxSize: 5, // MB + // Without this, rotated logs will never be deleted. MaxBackups: 1, } defer logWriter.Close() @@ -145,8 +146,9 @@ func (r *RootCmd) workspaceAgent() *clibase.Cmd { go DumpHandler(ctx) ljLogger := &lumberjack.Logger{ - Filename: filepath.Join(logDir, "coder-agent.log"), - MaxSize: 5, // MB + Filename: filepath.Join(logDir, "coder-agent.log"), + MaxSize: 5, // MB + // Without this, rotated logs will never be deleted. MaxBackups: 1, } defer ljLogger.Close()