From 253f5dcfab0bcc6d9839aac20f4e551ec23529d4 Mon Sep 17 00:00:00 2001 From: Hossin Asaadi Date: Sat, 5 Nov 2022 11:10:21 -0400 Subject: [PATCH] sort Log Ips --- web/job/check_clinet_ip_job.go | 5 +++-- web/web.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/job/check_clinet_ip_job.go b/web/job/check_clinet_ip_job.go index 066a5cda..5eb4dbdf 100644 --- a/web/job/check_clinet_ip_job.go +++ b/web/job/check_clinet_ip_job.go @@ -92,6 +92,7 @@ func processLogFile() { disAllowedIps = []string{} for clientEmail, ips := range InboundClientIps { + sort.Sort(sort.StringSlice(ips)) inboundClientIps := GetInboundClientIps(clientEmail, ips) if inboundClientIps != nil { inboundsClientIps = append(inboundsClientIps, inboundClientIps) @@ -104,8 +105,8 @@ func processLogFile() { // check if inbound connection is more than limited ip and drop connection LimitDevice := func() { LimitDevice() } - stop := schedule(LimitDevice, 700 *time.Millisecond) - time.Sleep(60 * time.Second) + stop := schedule(LimitDevice, 100 *time.Millisecond) + time.Sleep(11 * time.Second) stop <- true } diff --git a/web/web.go b/web/web.go index 0793a390..16ee643c 100644 --- a/web/web.go +++ b/web/web.go @@ -296,8 +296,8 @@ func (s *Server) startTask() { // 每 30 秒检查一次 inbound 流量超出和到期的情况 s.cron.AddJob("@every 30s", job.NewCheckInboundJob()) - // check client ips from log file every 30 sec - s.cron.AddJob("@every 30s", job.NewCheckClientIpJob()) + // check client ips from log file every 10 sec + s.cron.AddJob("@every 10s", job.NewCheckClientIpJob()) // 每一天提示一次流量情况,上海时间8点30 var entry cron.EntryID