From 864ebcc61094a70888db35bd3b60928abca816ca Mon Sep 17 00:00:00 2001
From: wood chen <wood@czl.net>
Date: Thu, 5 Dec 2024 08:23:38 +0800
Subject: [PATCH] test

---
 internal/handler/metrics.go   | 42 +++++++++++++++--------------------
 internal/metrics/collector.go | 23 ++++++++++---------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/internal/handler/metrics.go b/internal/handler/metrics.go
index 7157661..d18ca08 100644
--- a/internal/handler/metrics.go
+++ b/internal/handler/metrics.go
@@ -389,41 +389,35 @@ var metricsTemplate = `
         }
 +       #statusCodes {
 +           display: flex;
-+           gap: 20px;
-+           align-items: center;
-+           flex-wrap: wrap;
++           flex-direction: column;
++           gap: 10px;
++           align-items: flex-start;
 +           padding: 10px;
-+           justify-content: flex-start;
 +           background: #f8f9fa;
 +           border-radius: 8px;
-+           overflow-x: auto;
-+           white-space: nowrap;
++           flex-wrap: nowrap;  // 防止换行
++           overflow-x: auto;   // 在小屏幕上可以滚动
 +       }
 +       
 +       #statusCodes .metric {
-+           flex: 0 0 auto;
-+           display: inline-flex;
++           flex: 0 0 auto;     // 不伸缩，保持原始大小
++           display: flex;
 +           align-items: center;
-+           gap: 10px;
++           justify-content: space-between;
 +           padding: 4px 12px;
 +           background: white;
-+           border-radius: 20px;
-+           margin: 0;
-+           border: none;
-+           min-width: 80px;
-+           justify-content: space-between;
-+           margin-right: 10px;
-+           display: inline-block;
++           border-radius: 4px;
++           box-shadow: 0 1px 3px rgba(0,0,0,0.1);
++           min-width: 120px;   // 设置最小宽度
++           margin-right: 10px; // 格子之间的间距
 +       }
-+       #statusCodes .metric:last-child {
-+           margin-right: 0;
++       .status-badge {
++           padding: 3px 8px;
++           border-radius: 12px;
++           font-size: 12px;
++           color: white;
++           margin-right: 8px;  // 状态码和数字之间的间距
 +       }
-        .status-badge {
-            padding: 3px 8px;
-            border-radius: 12px;
-            font-size: 12px;
-            color: white;
-        }
 +       .loading {
 +           position: relative;
 +           opacity: 0.6;
diff --git a/internal/metrics/collector.go b/internal/metrics/collector.go
index 2cb6c7c..2e46d59 100644
--- a/internal/metrics/collector.go
+++ b/internal/metrics/collector.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"math/rand"
 	"net/http"
 	"proxy-go/internal/cache"
 	"proxy-go/internal/config"
@@ -91,26 +92,25 @@ func InitCollector(dbPath string, config *config.Config) error {
 
 	// 启动定时保存
 	go func() {
-		ticker := time.NewTicker(5 * time.Minute)
+		// 避免所有实例同时保存
+		time.Sleep(time.Duration(rand.Int63n(60)) * time.Second)
+		ticker := time.NewTicker(10 * time.Minute)
 		for range ticker.C {
 			stats := globalCollector.GetStats()
+			start := time.Now()
+
+			// 保存基础指标和完整统计数据
 			if err := db.SaveMetrics(stats); err != nil {
 				log.Printf("Error saving metrics: %v", err)
 			} else {
-				log.Printf("Metrics saved successfully")
+				log.Printf("Basic metrics saved successfully")
 			}
-		}
-	}()
 
-	// 启动每小时保存统计数据
-	go func() {
-		ticker := time.NewTicker(1 * time.Hour)
-		for range ticker.C {
-			stats := globalCollector.GetStats()
+			// 同时保存完整统计数据
 			if err := db.SaveFullMetrics(stats); err != nil {
 				log.Printf("Error saving full metrics: %v", err)
 			} else {
-				log.Printf("Full metrics saved successfully")
+				log.Printf("Metrics saved in %v", time.Since(start))
 			}
 		}
 	}()
@@ -292,8 +292,9 @@ func (c *Collector) GetStats() map[string]interface{} {
 
 	// 状态码统计
 	statusStats := make(map[string]int64)
+	statusGroups := []string{"1xx", "2xx", "3xx", "4xx", "5xx"}
 	for i := range c.statusStats {
-		statusStats[fmt.Sprintf("%dxx", i+1)] = c.statusStats[i].Load()
+		statusStats[statusGroups[i]] = c.statusStats[i].Load()
 	}
 	stats["status_code_stats"] = statusStats