使用 fixedRate

PBH-BTN · Nov 11, 2024 · 843a037 · 843a037
1 parent 8eb8b06
commit 843a037
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java b/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java
@@ -65,7 +65,7 @@ public class AnalyseService {
     @Transactional
     @Modifying
     @Lock(LockModeType.READ)
-    @Scheduled(fixedDelayString = "${analyse.untrustip.interval}")
+    @Scheduled(fixedRateString = "${analyse.untrustip.interval}")
     public void cronUntrustedIPAddresses() {
         var list = ipMerger.merge(banHistoryRepository
                         .generateUntrustedIPAddresses(
@@ -101,7 +101,7 @@ public List<AnalysedRule> getOverDownloadIPAddresses() {
     @Transactional
     @Modifying
     @Lock(LockModeType.READ)
-    @Scheduled(fixedDelayString = "${analyse.highriskips.interval}")
+    @Scheduled(fixedRateString = "${analyse.highriskips.interval}")
     public void cronHighRiskIps() {
         Set<IPAddress> list =
                 new HashSet<>(banHistoryRepository
@@ -145,7 +145,7 @@ public List<AnalysedRule> getHighRiskIps() {
     @Transactional
     @Modifying
     @Lock(LockModeType.READ)
-    @Scheduled(fixedDelayString = "${analyse.highriskipv6identity.interval}")
+    @Scheduled(fixedRateString = "${analyse.highriskipv6identity.interval}")
     public void cronHighRiskIPV6Identity() {
         Set<IPAddress> list = new HashSet<>();
         banHistoryRepository.findByPeerIp(
@@ -183,7 +183,7 @@ public List<AnalysedRule> getHighRiskIPV6Identity() {
     @Transactional
     @Modifying
     @Lock(LockModeType.READ)
-    @Scheduled(fixedDelayString = "${analyse.overdownload.interval}")
+    @Scheduled(fixedRateString = "${analyse.overdownload.interval}")
     public void cronUpdateOverDownload() {
         var query = entityManager.createNativeQuery("""
                 WITH LatestSnapshots AS (
@@ -248,7 +248,7 @@ AggregatedUploads AS (
 //    @Transactional
 //    @Modifying
 //    @Lock(LockModeType.READ)
-//    @Scheduled(fixedDelayString = "${analyse.untrustip.interval}")
+//    @Scheduled(fixedRateString = "${analyse.untrustip.interval}")
 //    public void cronUpdateOverDownload() {
 //        var query = entityManager.createNativeQuery("""
 //                WITH LatestSnapshots AS (

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/audit/AuditService.java b/src/main/java/com/ghostchu/btn/sparkle/module/audit/AuditService.java
@@ -29,7 +29,7 @@ public void log(HttpServletRequest req, String action, boolean success, Map<Stri
         auditQueue.add(new Audit(null, OffsetDateTime.now(), IPUtil.toInet(ServletUtil.getIP(req)), action, success, getHeaders(req), node));
     }
 
-    @Scheduled(fixedDelay = 10, timeUnit = TimeUnit.SECONDS)
+    @Scheduled(fixedRate = 10, timeUnit = TimeUnit.SECONDS)
     @Transactional
     @Modifying
     public void updateTrackerMetrics() {

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/githubupdate/GithubUpdateService.java b/src/main/java/com/ghostchu/btn/sparkle/module/githubupdate/GithubUpdateService.java
@@ -47,7 +47,7 @@ public GithubUpdateService(BanHistoryRepository banHistoryRepository, AnalyseSer
     }
 
 
-    @Scheduled(fixedDelayString = "${service.githubruleupdate.interval}")
+    @Scheduled(fixedRateString = "${service.githubruleupdate.interval}")
     @Transactional
     public void githubRuleUpdate() throws IOException {
         log.info("开始更新 GitHub 同步规则存储库...");

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/tracker/TrackerService.java b/src/main/java/com/ghostchu/btn/sparkle/module/tracker/TrackerService.java
@@ -71,7 +71,7 @@ public TrackerService(TrackedPeerRepository trackedPeerRepository,
         this.semaphore = new Semaphore(maxParallelAnnounce);
     }
 
-    @Scheduled(fixedDelayString = "${service.tracker.metrics-interval}")
+    @Scheduled(fixedRateString = "${service.tracker.metrics-interval}")
     @Transactional
     public void updateTrackerMetrics() {
         var totalPeers = meterRegistry.gauge("sparkle_tracker_tracking_total_peers", trackedPeerRepository.count());
@@ -81,7 +81,7 @@ public void updateTrackerMetrics() {
         log.info("[Tracker 实时] 总Peer: {}, 唯一Peer: {}, 唯一IP: {}, 活动种子: {}", totalPeers, uniquePeers, uniqueIps, activeTasks);
     }
 
-    @Scheduled(fixedDelayString = "${service.tracker.cleanup-interval}")
+    @Scheduled(fixedRateString = "${service.tracker.cleanup-interval}")
     @Transactional
     public void cleanup() {
         var count = trackedPeerRepository.deleteByLastTimeSeenLessThanEqual(TimeUtil.toUTC(System.currentTimeMillis() - inactiveInterval));
@@ -94,7 +94,7 @@ public void scheduleAnnounce(PeerAnnounce announce) {
 
     @Modifying
     @Transactional
-    @Scheduled(fixedDelayString = "${service.tracker.announce-flush-interval}")
+    @Scheduled(fixedRateString = "${service.tracker.announce-flush-interval}")
     public void flushAnnounces() {
         boolean locked = announceFlushLock.tryLock();
         if (!locked) {

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/user/UserService.java b/src/main/java/com/ghostchu/btn/sparkle/module/user/UserService.java
@@ -31,7 +31,7 @@ public UserService(UserRepository userRepository) {
 //        return (UserDto) StpUtil.getLoginId();
 //    }
 
-    @Scheduled(fixedDelayString = "${service.user.metrics-interval}")
+    @Scheduled(fixedRateString = "${service.user.metrics-interval}")
     @Transactional
     public void updateUserMetrics() {
         meterRegistry.gauge("sparkle_user_total", userRepository.count());