mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
298 lines
8.7 KiB
Go
298 lines
8.7 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package glog
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/garray"
|
|
"github.com/gogf/gf/v2/encoding/gcompress"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/os/gfile"
|
|
"github.com/gogf/gf/v2/os/gmlock"
|
|
"github.com/gogf/gf/v2/os/gtime"
|
|
"github.com/gogf/gf/v2/os/gtimer"
|
|
"github.com/gogf/gf/v2/text/gregex"
|
|
)
|
|
|
|
const (
|
|
memoryLockPrefixForRotating = "glog.rotateChecksTimely:"
|
|
)
|
|
|
|
// rotateFileBySize rotates the current logging file according to the
|
|
// configured rotation size.
|
|
func (l *Logger) rotateFileBySize(ctx context.Context, now time.Time) {
|
|
if l.config.RotateSize <= 0 {
|
|
return
|
|
}
|
|
if err := l.doRotateFile(ctx, l.getFilePath(now)); err != nil {
|
|
// panic(err)
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}
|
|
|
|
// doRotateFile rotates the given logging file.
|
|
func (l *Logger) doRotateFile(ctx context.Context, filePath string) error {
|
|
memoryLockKey := "glog.doRotateFile:" + filePath
|
|
if !gmlock.TryLock(memoryLockKey) {
|
|
return nil
|
|
}
|
|
defer gmlock.Unlock(memoryLockKey)
|
|
|
|
intlog.PrintFunc(ctx, func() string {
|
|
return fmt.Sprintf(`start rotating file by size: %s, file: %s`, gfile.SizeFormat(filePath), filePath)
|
|
})
|
|
defer intlog.PrintFunc(ctx, func() string {
|
|
return fmt.Sprintf(`done rotating file by size: %s, size: %s`, gfile.SizeFormat(filePath), filePath)
|
|
})
|
|
|
|
// No backups, it then just removes the current logging file.
|
|
if l.config.RotateBackupLimit == 0 {
|
|
if err := gfile.RemoveFile(filePath); err != nil {
|
|
return err
|
|
}
|
|
intlog.Printf(
|
|
ctx,
|
|
`%d size exceeds, no backups set, remove original logging file: %s`,
|
|
l.config.RotateSize, filePath,
|
|
)
|
|
return nil
|
|
}
|
|
// Else it creates new backup files.
|
|
var (
|
|
dirPath = gfile.Dir(filePath)
|
|
fileName = gfile.Name(filePath)
|
|
fileExtName = gfile.ExtName(filePath)
|
|
newFilePath = ""
|
|
)
|
|
// Rename the logging file by adding extra datetime information to microseconds, like:
|
|
// access.log -> access.20200326101301899002.log
|
|
// access.20200326.log -> access.20200326.20200326101301899002.log
|
|
for {
|
|
var (
|
|
now = gtime.Now()
|
|
micro = now.Microsecond() % 1000
|
|
)
|
|
if micro == 0 {
|
|
micro = 101
|
|
} else {
|
|
for micro < 100 {
|
|
micro *= 10
|
|
}
|
|
}
|
|
newFilePath = gfile.Join(
|
|
dirPath,
|
|
fmt.Sprintf(
|
|
`%s.%s%d.%s`,
|
|
fileName, now.Format("YmdHisu"), micro, fileExtName,
|
|
),
|
|
)
|
|
if !gfile.Exists(newFilePath) {
|
|
break
|
|
} else {
|
|
intlog.Printf(ctx, `rotation file exists, continue: %s`, newFilePath)
|
|
}
|
|
}
|
|
intlog.Printf(ctx, "rotating file by size from %s to %s", filePath, newFilePath)
|
|
if err := gfile.Rename(filePath, newFilePath); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// rotateChecksTimely timely checks the backups expiration and the compression.
|
|
func (l *Logger) rotateChecksTimely(ctx context.Context) {
|
|
defer gtimer.AddOnce(ctx, l.config.RotateCheckInterval, l.rotateChecksTimely)
|
|
|
|
// Checks whether file rotation not enabled.
|
|
if l.config.RotateSize <= 0 && l.config.RotateExpire == 0 {
|
|
intlog.Printf(
|
|
ctx,
|
|
"logging rotation ignore checks: RotateSize: %d, RotateExpire: %s",
|
|
l.config.RotateSize, l.config.RotateExpire.String(),
|
|
)
|
|
return
|
|
}
|
|
|
|
// It here uses memory lock to guarantee the concurrent safety.
|
|
memoryLockKey := memoryLockPrefixForRotating + l.config.Path
|
|
if !gmlock.TryLock(memoryLockKey) {
|
|
return
|
|
}
|
|
defer gmlock.Unlock(memoryLockKey)
|
|
|
|
var (
|
|
now = time.Now()
|
|
pattern = "*.log, *.gz"
|
|
files, err = gfile.ScanDirFile(l.config.Path, pattern, true)
|
|
)
|
|
if err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
intlog.Printf(ctx, "logging rotation start checks: %+v", files)
|
|
// get file name regex pattern
|
|
// access-{y-m-d}-test.log => access-$-test.log => access-\$-test\.log => access-(.+?)-test\.log
|
|
fileNameRegexPattern, _ := gregex.ReplaceString(`{.+?}`, "$", l.config.File)
|
|
fileNameRegexPattern = gregex.Quote(fileNameRegexPattern)
|
|
fileNameRegexPattern = strings.ReplaceAll(fileNameRegexPattern, "\\$", "(.+?)")
|
|
// =============================================================
|
|
// Rotation of expired file checks.
|
|
// =============================================================
|
|
if l.config.RotateExpire > 0 {
|
|
var (
|
|
mtime time.Time
|
|
subDuration time.Duration
|
|
expireRotated bool
|
|
)
|
|
for _, file := range files {
|
|
// ignore backup file
|
|
if gregex.IsMatchString(`.+\.\d{20}\.log`, gfile.Basename(file)) || gfile.ExtName(file) == "gz" {
|
|
continue
|
|
}
|
|
// ignore not matching file
|
|
if !gregex.IsMatchString(fileNameRegexPattern, file) {
|
|
continue
|
|
}
|
|
mtime = gfile.MTime(file)
|
|
subDuration = now.Sub(mtime)
|
|
if subDuration > l.config.RotateExpire {
|
|
func() {
|
|
memoryLockFileKey := memoryLockPrefixForPrintingToFile + file
|
|
if !gmlock.TryLock(memoryLockFileKey) {
|
|
return
|
|
}
|
|
defer gmlock.Unlock(memoryLockFileKey)
|
|
expireRotated = true
|
|
intlog.Printf(
|
|
ctx,
|
|
`%v - %v = %v > %v, rotation expire logging file: %s`,
|
|
now, mtime, subDuration, l.config.RotateExpire, file,
|
|
)
|
|
if err = l.doRotateFile(ctx, file); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}()
|
|
}
|
|
}
|
|
if expireRotated {
|
|
// Update the files array.
|
|
files, err = gfile.ScanDirFile(l.config.Path, pattern, true)
|
|
if err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// =============================================================
|
|
// Rotated file compression.
|
|
// =============================================================
|
|
needCompressFileArray := garray.NewStrArray()
|
|
if l.config.RotateBackupCompress > 0 {
|
|
for _, file := range files {
|
|
// Eg: access.20200326101301899002.log.gz
|
|
if gfile.ExtName(file) == "gz" {
|
|
continue
|
|
}
|
|
// ignore not matching file
|
|
originalLoggingFilePath, _ := gregex.ReplaceString(`\.\d{20}`, "", file)
|
|
if !gregex.IsMatchString(fileNameRegexPattern, originalLoggingFilePath) {
|
|
continue
|
|
}
|
|
// Eg:
|
|
// access.20200326101301899002.log
|
|
if gregex.IsMatchString(`.+\.\d{20}\.log`, gfile.Basename(file)) {
|
|
needCompressFileArray.Append(file)
|
|
}
|
|
}
|
|
if needCompressFileArray.Len() > 0 {
|
|
needCompressFileArray.Iterator(func(_ int, path string) bool {
|
|
err := gcompress.GzipFile(path, path+".gz")
|
|
if err == nil {
|
|
intlog.Printf(ctx, `compressed done, remove original logging file: %s`, path)
|
|
if err = gfile.RemoveFile(path); err != nil {
|
|
intlog.Print(ctx, err)
|
|
}
|
|
} else {
|
|
intlog.Print(ctx, err)
|
|
}
|
|
return true
|
|
})
|
|
// Update the files array.
|
|
files, err = gfile.ScanDirFile(l.config.Path, pattern, true)
|
|
if err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// =============================================================
|
|
// Backups count limitation and expiration checks.
|
|
// =============================================================
|
|
backupFiles := garray.NewSortedArray(func(a, b any) int {
|
|
// Sorted by rotated/backup file mtime.
|
|
// The older rotated/backup file is put in the head of array.
|
|
var (
|
|
file1 = a.(string)
|
|
file2 = b.(string)
|
|
result = gfile.MTimestampMilli(file1) - gfile.MTimestampMilli(file2)
|
|
)
|
|
if result <= 0 {
|
|
return -1
|
|
}
|
|
return 1
|
|
})
|
|
if l.config.RotateBackupLimit > 0 || l.config.RotateBackupExpire > 0 {
|
|
for _, file := range files {
|
|
// ignore not matching file
|
|
originalLoggingFilePath, _ := gregex.ReplaceString(`\.\d{20}`, "", file)
|
|
if !gregex.IsMatchString(fileNameRegexPattern, originalLoggingFilePath) {
|
|
continue
|
|
}
|
|
if gregex.IsMatchString(`.+\.\d{20}\.log`, gfile.Basename(file)) {
|
|
backupFiles.Add(file)
|
|
}
|
|
}
|
|
intlog.Printf(ctx, `calculated backup files array: %+v`, backupFiles)
|
|
diff := backupFiles.Len() - l.config.RotateBackupLimit
|
|
for i := 0; i < diff; i++ {
|
|
path, _ := backupFiles.PopLeft()
|
|
intlog.Printf(ctx, `remove exceeded backup limit file: %s`, path)
|
|
if err = gfile.RemoveFile(path.(string)); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
}
|
|
// Backups expiration checking.
|
|
if l.config.RotateBackupExpire > 0 {
|
|
var (
|
|
mtime time.Time
|
|
subDuration time.Duration
|
|
)
|
|
backupFiles.Iterator(func(_ int, v any) bool {
|
|
path := v.(string)
|
|
mtime = gfile.MTime(path)
|
|
subDuration = now.Sub(mtime)
|
|
if subDuration > l.config.RotateBackupExpire {
|
|
intlog.Printf(
|
|
ctx,
|
|
`%v - %v = %v > %v, remove expired backup file: %s`,
|
|
now, mtime, subDuration, l.config.RotateBackupExpire, path,
|
|
)
|
|
if err = gfile.RemoveFile(path); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
}
|
|
return true
|
|
} else {
|
|
return false
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|