From 278e85357ddcf55bb15eb2b7b0bb86a0de0b18c0 Mon Sep 17 00:00:00 2001 From: prcseraph <328154026@qq.com> Date: Tue, 8 Dec 2020 18:54:42 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=88=87=E7=89=87=E6=97=B6=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=E8=AF=BB=E5=86=99=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/glog/glog_logger.go | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/os/glog/glog_logger.go b/os/glog/glog_logger.go index 1b3a8bea7..28643cd4b 100644 --- a/os/glog/glog_logger.go +++ b/os/glog/glog_logger.go @@ -241,6 +241,15 @@ func (l *Logger) printToFile(now time.Time, buffer *bytes.Buffer) { ) gmlock.Lock(memoryLockKey) defer gmlock.Unlock(memoryLockKey) + + // + 2020-12-08 18:13:09 + // Rotation file size checks. + if l.config.RotateSize > 0 { + if gfile.Size(logFilePath) > l.config.RotateSize { + l.rotateFileBySize(now) + } + } + file := l.getFilePointer(logFilePath) if file == nil { intlog.Errorf(`got nil file pointer for: %s`, logFilePath) @@ -248,28 +257,15 @@ func (l *Logger) printToFile(now time.Time, buffer *bytes.Buffer) { } // Please note that it differs from `file.Close()`, // as the variable `file` would be changed in next logic. - defer func() { - file.Close() - }() - // Rotation file size checks. - if l.config.RotateSize > 0 { - stat, err := file.Stat() - if err != nil { - // panic(err) - intlog.Error(err) - return - } - if stat.Size() > l.config.RotateSize { - l.rotateFileBySize(now) - // Refresh - file = l.getFilePointer(logFilePath) - } - } + //defer func() { + file.Close() + //}() if _, err := file.Write(buffer.Bytes()); err != nil { // panic(err) intlog.Error(err) return } + // $ 2020-12-08 18:13:14 } // getFilePointer retrieves and returns a file pointer from file pool.