Merge pull request #5 from devfeel/aicode

feat: add JSON structured log target

Author: devfeel

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI
+
+on:
+  push:
+    branches: [master, develop, aicode]
+  pull_request:
+    branches: [aicode]
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.18'
+          cache: true
+
+      - name: Download dependencies
+        run: go mod download
+
+      - name: Build
+        run: go build -v ./...
+
+      - name: Run tests
+        run: go test -v -race -coverprofile=coverage.out ./...
+
+      - name: Upload coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage
+          path: coverage.out
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.18'
+          cache: true
+
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: latest

config/config.go

@@ -60,7 +60,8 @@ type (
 		UdpTargets   []*UdpTargetConfig   `xml:"udp>target"`
 		HttpTargets  []*HttpTargetConfig  `xml:"http>target"`
 		EMailTargets []*EMailTargetConfig `xml:"email>target"`
-		FmtTargets []*FmtTargetConfig `xml:"fmt>target"`
+		FmtTargets   []*FmtTargetConfig   `xml:"fmt>target"`
+		JSONTargets  []*JSONTargetConfig  `xml:"json>target"`
 	}
 
 	FileTargetConfig struct {

config/config.yaml

@@ -0,0 +1,75 @@
+# dotlog YAML 配置文件示例
+# 使用说明: 将文件名传递给 StartLogService("config.yaml") 即可
+
+global:
+  isLog: true
+  chanSize: 1000
+  innerLogPath: "./"
+  innerLogEncode: "utf-8"
+
+# 自定义变量
+variables:
+  - name: LogDir
+    value: "./logs/"
+  - name: LogDateDir
+    value: "./logs/{year}/{month}/{day}/"
+
+# 日志输出目标
+targets:
+  # 文件输出
+  file:
+    - name: FileLogger
+      isLog: true
+      layout: "{datetime} - {message}"
+      encode: "utf-8"
+      fileMaxSize: 10240  # KB
+      fileName: "./logs/app.log"
+
+  # 标准输出
+  fmt:
+    - name: StdoutLogger
+      isLog: true
+      layout: "[{level}] {datetime} - {message}"
+      encode: "utf-8"
+
+  # UDP 输出 (可选)
+  # udp:
+  #   - name: UdpLogger
+  #     isLog: true
+  #     layout: "{message}"
+  #     encode: "utf-8"
+  #     remoteIP: "127.0.0.1:9000"
+
+  # HTTP 输出 (可选)
+  # http:
+  #   - name: HttpLogger
+  #     isLog: true
+  #     layout: "{message}"
+  #     encode: "utf-8"
+  #     httpUrl: "http://localhost:8080/log"
+
+# 日志记录器配置
+loggers:
+  - name: FileLogger
+    isLog: true
+    layout: "{datetime} - {message}"
+    configMode: "file"
+    levels:
+      - level: info
+        targets: "FileLogger"
+        isLog: true
+      - level: error
+        targets: "FileLogger"
+        isLog: true
+
+  - name: StdoutLogger
+    isLog: true
+    layout: "[{level}] {datetime} - {message}"
+    configMode: "fmt"
+    levels:
+      - level: debug
+        targets: "StdoutLogger"
+        isLog: true
+      - level: info
+        targets: "StdoutLogger"
+        isLog: true

config/json.go

@@ -0,0 +1,12 @@
+package config
+
+// JSONTargetConfig JSON 输出目标配置
+type JSONTargetConfig struct {
+	Name        string `yaml:"name"`
+	IsLog       bool   `yaml:"isLog"`
+	Layout      string `yaml:"layout"`
+	Encode      string `yaml:"encode"`
+	FileName    string `yaml:"fileName"`
+	FileMaxSize int64  `yaml:"fileMaxSize"`
+	PrettyPrint *bool  `yaml:"prettyPrint"`
+}

config/json_test.go

@@ -0,0 +1,68 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestLoadYamlConfigWithJSON(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "test.json.yaml")
+
+	yamlContent := `
+global:
+  isLog: true
+  chanSize: 1000
+  innerLogPath: "./"
+  innerLogEncode: "utf-8"
+
+targets:
+  json:
+    - name: JSONLogger
+      isLog: true
+      layout: "{datetime} - {message}"
+      encode: "utf-8"
+      fileName: "./logs/app.json"
+      fileMaxSize: 10240
+      prettyPrint: true
+
+loggers:
+  - name: JSONLogger
+    isLog: true
+    layout: "{datetime} - {message}"
+    configMode: "json"
+    levels:
+      - level: info
+        targets: "JSONLogger"
+        isLog: true
+`
+	err := os.WriteFile(configFile, []byte(yamlContent), 0644)
+	if err != nil {
+		t.Fatalf("failed to create test config: %v", err)
+	}
+
+	config, err := LoadYamlConfig(configFile)
+	if err != nil {
+		t.Fatalf("failed to load YAML config: %v", err)
+	}
+
+	// Verify JSON targets
+	if len(config.Targets.JSONTargets) != 1 {
+		t.Errorf("expected 1 JSON target, got %d", len(config.Targets.JSONTargets))
+	}
+
+	jsonTarget := config.Targets.JSONTargets[0]
+	if jsonTarget.Name != "JSONLogger" {
+		t.Errorf("expected target name JSONLogger, got %s", jsonTarget.Name)
+	}
+	if jsonTarget.FileName != "./logs/app.json" {
+		t.Errorf("expected fileName ./logs/app.json, got %s", jsonTarget.FileName)
+	}
+	if jsonTarget.FileMaxSize != 10240 {
+		t.Errorf("expected fileMaxSize 10240, got %d", jsonTarget.FileMaxSize)
+	}
+	if jsonTarget.PrettyPrint == nil || !*jsonTarget.PrettyPrint {
+		t.Error("expected prettyPrint to be true")
+	}
+}