fix CronTrigger.from_crontab异常捕捉

This commit is contained in:
jxxghp 2023-09-22 14:42:11 +08:00
parent 29df0813fd
commit ea160afd90

View File

@ -84,20 +84,25 @@ class CloudflareSpeedTest(_PluginBase):
if self.get_state() or self._onlyonce: if self.get_state() or self._onlyonce:
self._scheduler = BackgroundScheduler(timezone=settings.TZ) self._scheduler = BackgroundScheduler(timezone=settings.TZ)
if self.get_state() and self._cron: try:
logger.info(f"Cloudflare CDN优选服务启动周期{self._cron}") if self.get_state() and self._cron:
self._scheduler.add_job(func=self.__cloudflareSpeedTest, logger.info(f"Cloudflare CDN优选服务启动周期{self._cron}")
trigger=CronTrigger.from_crontab(self._cron), self._scheduler.add_job(func=self.__cloudflareSpeedTest,
name="Cloudflare优选") trigger=CronTrigger.from_crontab(self._cron),
name="Cloudflare优选")
if self._onlyonce: if self._onlyonce:
logger.info(f"Cloudflare CDN优选服务启动立即运行一次") logger.info(f"Cloudflare CDN优选服务启动立即运行一次")
self._scheduler.add_job(func=self.__cloudflareSpeedTest, trigger='date', self._scheduler.add_job(func=self.__cloudflareSpeedTest, trigger='date',
run_date=datetime.now(tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3), run_date=datetime.now(tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3),
name="Cloudflare优选") name="Cloudflare优选")
# 关闭一次性开关 # 关闭一次性开关
self._onlyonce = False self._onlyonce = False
self.__update_config() self.__update_config()
except Exception as err:
logger.error(f"Cloudflare CDN优选服务出错{str(err)}")
self.systemmessage.put(f"Cloudflare CDN优选服务出错{str(err)}")
return
# 启动任务 # 启动任务
if self._scheduler.get_jobs(): if self._scheduler.get_jobs():