Просмотр исходного кода

起草浮动时间,待完善逻辑

yEs1do 2 лет назад
Родитель
Сommit
169451c656
2 измененных файлов с 11 добавлено и 1 удалено
  1. 10 1
      module/config/config.py
  2. 1 0
      tasks/Component/config_scheduler.py

+ 10 - 1
module/config/config.py

@@ -5,6 +5,7 @@ import copy
 import datetime
 import operator
 import threading
+import random
 
 from datetime import datetime, timedelta
 from cached_property import cached_property
@@ -337,7 +338,15 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
                 "Missing argument in delay_next_run, should set at least one"
             )
 
-        run = min(run).replace(microsecond=0)
+        # 计算浮动时间
+        float_seconds = (
+            scheduler.float_time.hour * 3600 +
+            scheduler.float_time.minute * 60 +
+            scheduler.float_time.second
+        )
+        random_float = random.randint(-float_seconds, float_seconds)
+        run = min(run) + timedelta(seconds=random_float)
+        run = run.replace(microsecond=0)
         next_run = run
         # 将这些连接起来,方便日志输出
         kv = dict_to_kv(

+ 1 - 0
tasks/Component/config_scheduler.py

@@ -16,6 +16,7 @@ class Scheduler(ConfigBase):
     success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
     server_update: Time = Field(default=Time(hour=9, minute=0, second=0), description='server_update_help')
+    float_time: Time = Field(default=Time(hour=0, minute=0, second=0), description='float_time_help')
 
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):