[log]文件日志策略增加是否自动创建目录选项

Author: iwind

tealogs/storage_file.go

@@ -5,14 +5,16 @@ import (
 	"github.com/TeaWeb/code/tealogs/accesslogs"
 	"github.com/iwind/TeaGo/logs"
 	"os"
+	"path/filepath"
 	"sync"
 )
 
 // 文件存储策略
 type FileStorage struct {
 	Storage `yaml:", inline"`
 
-	Path string `yaml:"path" json:"path"` // 文件路径，支持变量：${year|month|week|day|hour|minute|second}
+	Path       string `yaml:"path" json:"path"`             // 文件路径，支持变量：${year|month|week|day|hour|minute|second}
+	AutoCreate bool   `yaml:"autoCreate" json:"autoCreate"` // 是否自动创建目录
 
 	writeLocker sync.Mutex
 
@@ -52,10 +54,10 @@ func (this *FileStorage) Write(accessLogs []*accesslogs.AccessLog) error {
 		}
 		_, err = fp.Write(data)
 		if err != nil {
-			this.Close()
+			_ = this.Close()
 			break
 		}
-		fp.WriteString("\n")
+		_, _ = fp.WriteString("\n")
 	}
 	return nil
 }
@@ -87,7 +89,20 @@ func (this *FileStorage) fp() *os.File {
 
 	// 关闭其他的文件
 	for _, f := range this.files {
-		f.Close()
+		_ = f.Close()
+	}
+
+	// 是否创建文件目录
+	if this.AutoCreate {
+		dir := filepath.Dir(path)
+		_, err := os.Stat(dir)
+		if os.IsNotExist(err) {
+			err = os.MkdirAll(dir, 0777)
+			if err != nil {
+				logs.Error(err)
+				return nil
+			}
+		}
 	}
 
 	// 打开新文件

teaweb/actions/default/proxy/log/policies/add.go

@@ -37,7 +37,8 @@ func (this *AddAction) RunPost(params struct {
 	StorageType     string
 
 	// file
-	FilePath string
+	FilePath       string
+	FileAutoCreate bool
 
 	// es
 	EsEndpoint    string
@@ -93,6 +94,7 @@ func (this *AddAction) RunPost(params struct {
 		storage.Format = params.StorageFormat
 		storage.Template = params.StorageTemplate
 		storage.Path = params.FilePath
+		storage.AutoCreate = params.FileAutoCreate
 		instance = storage
 	case tealogs.StorageTypeES:
 		params.Must.

teaweb/actions/default/proxy/log/policies/update.go

@@ -56,7 +56,8 @@ func (this *UpdateAction) RunPost(params struct {
 	StorageType     string
 
 	// file
-	FilePath string
+	FilePath       string
+	FileAutoCreate bool
 
 	// es
 	EsEndpoint    string
@@ -117,6 +118,7 @@ func (this *UpdateAction) RunPost(params struct {
 		storage.Format = params.StorageFormat
 		storage.Template = params.StorageTemplate
 		storage.Path = params.FilePath
+		storage.AutoCreate = params.FileAutoCreate
 		instance = storage
 	case tealogs.StorageTypeES:
 		params.Must.