From f48dfa844827e6e2f3b6ff19ea69ccf4834ce942 Mon Sep 17 00:00:00 2001 From: HynoR <20227709+HynoR@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:04:08 +0800 Subject: [PATCH 1/2] fix: Update log queue size to improve performance and ensure proper handling of log entries --- core/log/config.go | 4 +++- core/log/writer.go | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/log/config.go b/core/log/config.go index 2757315e722d..4d20c2c01456 100644 --- a/core/log/config.go +++ b/core/log/config.go @@ -2,10 +2,11 @@ package log import ( "errors" - "github.com/1Panel-dev/1Panel/core/constant" "io" "os" "path" + + "github.com/1Panel-dev/1Panel/core/constant" ) var ( @@ -14,6 +15,7 @@ var ( DefaultFileFlag = os.O_RDWR | os.O_CREATE | os.O_APPEND ErrInvalidArgument = errors.New("error argument invalid") QueueSize = 1024 + LogQueueSize = 2048 ErrClosed = errors.New("error write on close") ) diff --git a/core/log/writer.go b/core/log/writer.go index b0c08b745faa..17f53803ec01 100644 --- a/core/log/writer.go +++ b/core/log/writer.go @@ -1,7 +1,6 @@ package log import ( - "github.com/1Panel-dev/1Panel/core/constant" "log" "os" "path" @@ -11,6 +10,8 @@ import ( "sync/atomic" "time" + "github.com/1Panel-dev/1Panel/core/constant" + "github.com/1Panel-dev/1Panel/core/global" ) @@ -98,7 +99,7 @@ func NewWriterFromConfig(c *Config) (RollingWriter, error) { var rollingWriter RollingWriter writer := Writer{ - queue: make(chan []byte, BufferSize), + queue: make(chan []byte, LogQueueSize), m: mng, file: file, absPath: filepath, From d8d9036ae63e600b32899c75586889cbcc05c108 Mon Sep 17 00:00:00 2001 From: HynoR <20227709+HynoR@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:57:41 +0800 Subject: [PATCH 2/2] fix: Adjust log queue size to maintain consistency with queue size limit --- core/log/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/log/config.go b/core/log/config.go index 4d20c2c01456..8a02a54f2320 100644 --- a/core/log/config.go +++ b/core/log/config.go @@ -15,7 +15,7 @@ var ( DefaultFileFlag = os.O_RDWR | os.O_CREATE | os.O_APPEND ErrInvalidArgument = errors.New("error argument invalid") QueueSize = 1024 - LogQueueSize = 2048 + LogQueueSize = 1024 ErrClosed = errors.New("error write on close") )