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

Merge branch 'dev_fix_scheduler' into dev_feat_next_run

Azure 1 год назад
Родитель
Сommit
f62941d019
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      module/config/config_model.py
  2. 2 2
      script.py

+ 1 - 1
module/config/config_model.py

@@ -80,7 +80,7 @@ from tasks.Duel.config import Duel
 
 class ConfigModel(ConfigBase):
     config_name: str = "oas"
-    running_task: str = None
+    running_task: str = ''
     script: Script = Field(default_factory=Script)
     restart: Restart = Field(default_factory=Restart)
     global_game: GlobalGame = Field(default_factory=GlobalGame)

+ 2 - 2
script.py

@@ -424,7 +424,7 @@ class Script:
             logger.set_file_logger(self.config_name, do_cleanup=True)
         start_day = date.today()
         logger.info(f'Start scheduler loop: {self.config_name}')
-        self.config.model.running_task = None
+        self.config.model.running_task = ''
 
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         if not self.config.script.device.run_background_only:
@@ -477,7 +477,7 @@ class Script:
             logger.hr(task, level=0)
             self.config.model.running_task = task
             success = self.run(inflection.camelize(task))
-            self.config.model.running_task = None
+            self.config.model.running_task = ''
             logger.info(f'Scheduler: End task `{task}`')
             self.is_first_task = False