opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 14:32:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

MuxWriter: Handle error for already closed file (#31119)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2021-02-11 10:34:51 +01:00
committed by GitHub
parent 5c9a10d423
commit 7394c98d38
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/infra/log/file.go
View File

@ -57,8 +57,8 @@ func (l *MuxWriter) Write(b []byte) (int, error) {
// set os.File in writer.
func (l *MuxWriter) setFD(fd *os.File) error {
if l.fd != nil {
if err := l.fd.Close(); err != nil {
return err
if err := l.fd.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
return fmt.Errorf("closing old file in MuxWriter failed: %w", err)
}
}
@ -143,16 +143,18 @@ func (w *FileLogWriter) lineCounter() (int, error) {
count := 0
for {
c, err := r.Read(buf)
count += bytes.Count(buf[:c], []byte{'\n'})
switch {
case errors.Is(err, io.EOF):
if err := r.Close(); err != nil {
return count, err
if err != nil {
if errors.Is(err, io.EOF) {
if err := r.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
return 0, fmt.Errorf("closing %q failed: %w", w.Filename, err)
}
return count, nil
}
return count, nil
case err != nil:
return count, err
return 0, err
}
count += bytes.Count(buf[:c], []byte{'\n'})
}
}