Merge pull request #439 from PBH-BTN/master

v6.1.1
PBH-BTN · Sep 8, 2024 · f847d40 · f847d40
2 parents 140cf3f + fb8e66a
commit f847d40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ghostchu.peerbanhelper</groupId>
     <artifactId>peerbanhelper</artifactId>
-    <version>6.1.0</version>
+    <version>6.1.1</version>
     <packaging>takari-jar</packaging>
 
     <name>PeerBanHelper</name>

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ActiveMonitoringModule.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/ActiveMonitoringModule.java
@@ -34,16 +34,16 @@ public class ActiveMonitoringModule extends AbstractFeatureModule implements Rel
     private final PeerRecordDao peerRecordDao;
     private final Deque<PeerRecordDao.BatchHandleTasks> dataBuffer = new ConcurrentLinkedDeque<>();
     private final TrafficJournalDao trafficJournalDao;
-    private ExecutorService taskWriteService;
-    private long dataRetentionTime;
-    private ScheduledExecutorService scheduleService;
     private final BlockingDeque<Runnable> taskWriteQueue = new LinkedBlockingDeque<>();
     private final Cache<PeerRecordDao.BatchHandleTasks, Object> diskWriteCache = CacheBuilder
             .newBuilder()
             .expireAfterWrite(3, TimeUnit.MINUTES)
             .maximumSize(3500)
             .removalListener(notification -> dataBuffer.offer((PeerRecordDao.BatchHandleTasks) notification.getKey()))
             .build();
+    private ExecutorService taskWriteService;
+    private long dataRetentionTime;
+    private ScheduledExecutorService scheduleService;
 
     public ActiveMonitoringModule(PeerRecordDao peerRecordDao, TrafficJournalDao trafficJournalDao) {
         super();
@@ -123,10 +123,12 @@ private void writeJournal() {
         for (Downloader downloader : getServer().getDownloaders()) {
             try {
                 var entity = trafficJournalDao.getTodayJournal(downloader.getName());
-                var stats = downloader.getStatistics();
-                entity.setDataOverallUploaded(stats.totalUploaded());
-                entity.setDataOverallDownloaded(stats.totalDownloaded());
-                trafficJournalDao.update(entity);
+                if (downloader.login().success()) {
+                    var stats = downloader.getStatistics();
+                    entity.setDataOverallUploaded(stats.totalUploaded());
+                    entity.setDataOverallDownloaded(stats.totalDownloaded());
+                    trafficJournalDao.update(entity);
+                }
             } catch (Throwable e) {
                 log.error("Unable to write hourly traffic journal to database", e);
             }