From 0cf590111ffaab411c6e24125fdbcb84adfea0e5 Mon Sep 17 00:00:00 2001 From: tbphp Date: Fri, 11 Jul 2025 22:23:02 +0800 Subject: [PATCH] feat: rm log code --- internal/container/container.go | 3 --- internal/handler/log_cleanup_handler.go | 34 ------------------------- internal/handler/log_handler.go | 13 ---------- internal/router/router.go | 15 ++++------- internal/services/log_cleanup.go | 9 +------ 5 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 internal/handler/log_cleanup_handler.go diff --git a/internal/container/container.go b/internal/container/container.go index 1fa256b..76eb52f 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -77,9 +77,6 @@ func BuildContainer() (*dig.Container, error) { if err := container.Provide(handler.NewServer); err != nil { return nil, err } - if err := container.Provide(handler.NewLogCleanupHandler); err != nil { - return nil, err - } if err := container.Provide(handler.NewCommonHandler); err != nil { return nil, err } diff --git a/internal/handler/log_cleanup_handler.go b/internal/handler/log_cleanup_handler.go deleted file mode 100644 index 93f245a..0000000 --- a/internal/handler/log_cleanup_handler.go +++ /dev/null @@ -1,34 +0,0 @@ -package handler - -import ( - "gpt-load/internal/response" - "gpt-load/internal/services" - - "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" -) - -// LogCleanupHandler handles log cleanup related requests -type LogCleanupHandler struct { - LogCleanupService *services.LogCleanupService -} - -// NewLogCleanupHandler creates a new LogCleanupHandler -func NewLogCleanupHandler(s *services.LogCleanupService) *LogCleanupHandler { - return &LogCleanupHandler{ - LogCleanupService: s, - } -} - -// CleanupLogsNow handles the POST /api/logs/cleanup request. -// It triggers an asynchronous cleanup of expired request logs. -func (h *LogCleanupHandler) CleanupLogsNow(c *gin.Context) { - go func() { - logrus.Info("Asynchronous log cleanup started from API request") - h.LogCleanupService.CleanupNow() - }() - - response.Success(c, gin.H{ - "message": "Log cleanup process started in the background", - }) -} diff --git a/internal/handler/log_handler.go b/internal/handler/log_handler.go index a46523f..5ca08b9 100644 --- a/internal/handler/log_handler.go +++ b/internal/handler/log_handler.go @@ -13,19 +13,6 @@ import ( ) // GetLogs godoc -// @Summary Get request logs -// @Description Get request logs with pagination and filtering -// @Tags Logs -// @Accept json -// @Produce json -// @Param page query int false "Page number" -// @Param size query int false "Page size" -// @Param group_id query int false "Group ID" -// @Param start_time query string false "Start time (RFC3339)" -// @Param end_time query string false "End time (RFC3339)" -// @Param status_code query int false "Status code" -// @Success 200 {array} models.RequestLog -// @Router /api/logs [get] func GetLogs(c *gin.Context) { page, _ := strconv.Atoi(c.DefaultQuery("page", "1")) size, _ := strconv.Atoi(c.DefaultQuery("size", "10")) diff --git a/internal/router/router.go b/internal/router/router.go index 79ac4b9..64eef71 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -39,7 +39,6 @@ func EmbedFolder(fsEmbed embed.FS, targetPath string) static.ServeFileSystem { func NewRouter( serverHandler *handler.Server, proxyServer *proxy.ProxyServer, - logCleanupHandler *handler.LogCleanupHandler, configManager types.ConfigManager, buildFS embed.FS, indexPage []byte, @@ -61,7 +60,7 @@ func NewRouter( // 注册路由 registerSystemRoutes(router, serverHandler) - registerAPIRoutes(router, serverHandler, logCleanupHandler, configManager) + registerAPIRoutes(router, serverHandler, configManager) registerProxyRoutes(router, proxyServer, configManager) registerFrontendRoutes(router, buildFS, indexPage) @@ -75,7 +74,7 @@ func registerSystemRoutes(router *gin.Engine, serverHandler *handler.Server) { } // registerAPIRoutes 注册API路由 -func registerAPIRoutes(router *gin.Engine, serverHandler *handler.Server, logCleanupHandler *handler.LogCleanupHandler, configManager types.ConfigManager) { +func registerAPIRoutes(router *gin.Engine, serverHandler *handler.Server, configManager types.ConfigManager) { api := router.Group("/api") authConfig := configManager.GetAuthConfig() @@ -85,7 +84,7 @@ func registerAPIRoutes(router *gin.Engine, serverHandler *handler.Server, logCle // 认证 protectedAPI := api.Group("") protectedAPI.Use(middleware.Auth(authConfig)) - registerProtectedAPIRoutes(protectedAPI, serverHandler, logCleanupHandler) + registerProtectedAPIRoutes(protectedAPI, serverHandler) } // registerPublicAPIRoutes 公开API路由 @@ -94,7 +93,7 @@ func registerPublicAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Server } // registerProtectedAPIRoutes 认证API路由 -func registerProtectedAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Server, logCleanupHandler *handler.LogCleanupHandler) { +func registerProtectedAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Server) { api.GET("/channel-types", serverHandler.CommonHandler.GetChannelTypes) groups := api.Group("/groups") @@ -130,11 +129,7 @@ func registerProtectedAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Ser } // 日志 - logs := api.Group("/logs") - { - logs.GET("", handler.GetLogs) - logs.POST("/cleanup", logCleanupHandler.CleanupLogsNow) - } + api.GET("/logs", handler.GetLogs) // 设置 settings := api.Group("/settings") diff --git a/internal/services/log_cleanup.go b/internal/services/log_cleanup.go index 4c137a1..1bf7776 100644 --- a/internal/services/log_cleanup.go +++ b/internal/services/log_cleanup.go @@ -41,8 +41,7 @@ func (s *LogCleanupService) Stop() { // run 运行日志清理的主循环 func (s *LogCleanupService) run() { - // 每天凌晨2点执行清理任务 - ticker := time.NewTicker(24 * time.Hour) + ticker := time.NewTicker(2 * time.Hour) defer ticker.Stop() // 启动时先执行一次清理 @@ -94,9 +93,3 @@ func (s *LogCleanupService) cleanupExpiredLogs() { logrus.Debug("No expired request logs found to cleanup") } } - -// CleanupNow 立即执行一次日志清理 -func (s *LogCleanupService) CleanupNow() { - logrus.Info("Manual log cleanup triggered") - s.cleanupExpiredLogs() -}