From ec7f28179c77f2ac7d53d52989fc17bf72f15c06 Mon Sep 17 00:00:00 2001 From: egregors Date: Sun, 14 Sep 2025 11:27:42 +0200 Subject: [PATCH] fix: correct log message for completed periodic traffic reset --- web/job/periodic_traffic_reset_job.go | 2 +- web/service/inbound.go | 2 -- web/web.go | 8 +++----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/web/job/periodic_traffic_reset_job.go b/web/job/periodic_traffic_reset_job.go index 79001973..5d3cd178 100644 --- a/web/job/periodic_traffic_reset_job.go +++ b/web/job/periodic_traffic_reset_job.go @@ -39,6 +39,6 @@ func (j *PeriodicTrafficResetJob) Run() { } if resetCount > 0 { - logger.Infof("Periodic traffic reset completed: %d inbounds reset", resetCount) + logger.Infof("Periodic traffic reset completed: %d inbounds reseted", resetCount) } } diff --git a/web/service/inbound.go b/web/service/inbound.go index 410291fc..5cff8903 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -44,12 +44,10 @@ func (s *InboundService) GetAllInbounds() ([]*model.Inbound, error) { func (s *InboundService) GetInboundsByTrafficReset(period string) ([]*model.Inbound, error) { db := database.GetDB() var inbounds []*model.Inbound - logger.Info("Fetching inbounds with traffic reset period:", period) err := db.Model(model.Inbound{}).Where("traffic_reset = ?", period).Find(&inbounds).Error if err != nil && err != gorm.ErrRecordNotFound { return nil, err } - logger.Infof("Found %d inbounds with traffic reset period: %s", len(inbounds), period) return inbounds, nil } diff --git a/web/web.go b/web/web.go index c75d0b18..83b6c79f 100644 --- a/web/web.go +++ b/web/web.go @@ -271,19 +271,17 @@ func (s *Server) startTask() { { // Inbound traffic reset jobs // Run once a day, midnight - // TODO: for testing, run every minute, change back to daily later - // s.cron.AddJob("@daily", job.NewPeriodicTrafficResetJob("daily")) - s.cron.AddJob("@every 10s", job.NewPeriodicTrafficResetJob("daily")) + s.cron.AddJob("@daily", job.NewPeriodicTrafficResetJob("daily")) // Run once a week, midnight between Sat/Sun s.cron.AddJob("@weekly", job.NewPeriodicTrafficResetJob("weekly")) // Run once a month, midnight, first of month s.cron.AddJob("@monthly", job.NewPeriodicTrafficResetJob("monthly")) - // Client traffic reset jobs + // TODO: Client traffic reset jobs // logger.Info("Scheduling periodic client traffic reset jobs") // Run once a day, midnight // TODO: for testing, run every minute, change back to daily later - // s.cron.AddJob("@daily", job.NewPeriodicClientTrafficResetJob("daily")) + // s.cron.AddJob("@every 10s", job.NewPeriodicClientTrafficResetJob("daily")) // s.cron.AddJob("* * * * *", job.NewPeriodicClientTrafficResetJob("daily")) // Run once a week, midnight between Sat/Sun // s.cron.AddJob("@weekly", job.NewPeriodicClientTrafficResetJob("weekly"))