gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

fix: 修改log文件的压缩格式

Browse Source
This commit is contained in:
zhengkunwang223 2022-12-20 16:48:20 +08:00 committed by zhengkunwang223
parent 67aaa3b2bd
commit c05d669c5f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/init/log/log.go
View File

@ -16,7 +16,7 @@ import (
const ( const (
TimeFormat = "2006-01-02 15:04:05" TimeFormat = "2006-01-02 15:04:05"
FileTImeFormat = "2006-01-02-15-04-05" FileTImeFormat = "2006-01-02"
RollingTimePattern = "0 0 * * *" RollingTimePattern = "0 0 * * *"
) )
@ -28,7 +28,6 @@ func Init() {
} }
func setOutput(logger *logrus.Logger, config configs.LogConfig) { func setOutput(logger *logrus.Logger, config configs.LogConfig) {
writer, err := log.NewWriterFromConfig(&log.Config{ writer, err := log.NewWriterFromConfig(&log.Config{
LogPath: config.Path, LogPath: config.Path,
FileName: config.LogName, FileName: config.LogName,

6
backend/log/writer.go
View File

@ -120,7 +120,7 @@ func NewWriterFromConfig(c *Config) (RollingWriter, error) {
} }
fileName := c.FileName fileName := c.FileName
if strings.Contains(fi.Name(), fileName) && strings.Contains(fi.Name(), c.LogSuffix+".tar.gz") { if strings.Contains(fi.Name(), fileName) && strings.Contains(fi.Name(), c.LogSuffix+".gz") {
start := strings.Index(fi.Name(), "-") start := strings.Index(fi.Name(), "-")
end := strings.Index(fi.Name(), c.LogSuffix) end := strings.Index(fi.Name(), c.LogSuffix)
name := fi.Name() name := fi.Name()
@ -259,11 +259,11 @@ func (w *Writer) Reopen(file string) error {
func (w *Writer) CompressFile(logFile string) error { func (w *Writer) CompressFile(logFile string) error {
op := files.NewFileOp() op := files.NewFileOp()
comFileName := path.Base(logFile) + ".tar.gz" comFileName := path.Base(logFile) + ".gz"
filePath := path.Dir(logFile) filePath := path.Dir(logFile)
fmt.Println(path.Dir(logFile)) fmt.Println(path.Dir(logFile))
if err := op.Compress([]string{logFile}, filePath, comFileName, files.TarGz); err != nil { if err := op.Compress([]string{logFile}, filePath, comFileName, files.Gz); err != nil {
return err return err
} }
if errR := os.Remove(logFile); errR != nil { if errR := os.Remove(logFile); errR != nil {