Skip to content

fix：Asynchronous log writing has not taken effect #10000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wanghe-fit2cloud merged 1 commit into from
Aug 15, 2025
Merged

fix：Asynchronous log writing has not taken effect #10000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions core/log/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package log

import (
"github.com/1Panel-dev/1Panel/core/constant"
"log"
"os"
"path"
Expand All @@ -9,9 +10,6 @@ import (
"sync"
"sync/atomic"
"time"
"unsafe"

"github.com/1Panel-dev/1Panel/core/constant"

"github.com/1Panel-dev/1Panel/core/global"
)
Expand All @@ -23,12 +21,12 @@ type Writer struct {
fire chan string
cf *Config
rollingfilech chan string
queue chan []byte
}

type AsynchronousWriter struct {
Writer
ctx chan int
queue chan []byte
errChan chan error
closed int32
wg sync.WaitGroup
Expand Down Expand Up @@ -100,6 +98,7 @@ func NewWriterFromConfig(c *Config) (RollingWriter, error) {

var rollingWriter RollingWriter
writer := Writer{
queue: make(chan []byte, BufferSize),
m: mng,
file: file,
absPath: filepath,
Expand Down Expand Up @@ -156,17 +155,15 @@ func NewWriterFromConfig(c *Config) (RollingWriter, error) {

wr := &AsynchronousWriter{
ctx: make(chan int),
queue: make(chan []byte, QueueSize),
errChan: make(chan error, QueueSize),
wg: sync.WaitGroup{},
closed: 0,
Writer: writer,
}

rollingWriter = wr
wr.wg.Add(1)
go wr.writer()
wr.wg.Wait()
rollingWriter = wr

return rollingWriter, nil
}
Expand Down Expand Up @@ -211,9 +208,10 @@ func (w *Writer) Write(b []byte) (int, error) {
}
}

fp := atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&w.file)))
file := (*os.File)(fp)
return file.Write(b)
select {
case w.queue <- b:
return len(b), nil
}
}

func (w *Writer) Reopen(file string) error {
Expand Down