Merge pull request #338 from thsrite/main

This commit is contained in:
jxxghp 2023-08-30 15:37:00 +08:00 committed by GitHub
commit 16ba4587e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -79,7 +79,7 @@ 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._cron: if self.get_state() and self._cron:
logger.info(f"Cloudflare CDN优选服务启动周期{self._cron}") logger.info(f"Cloudflare CDN优选服务启动周期{self._cron}")
self._scheduler.add_job(func=self.__cloudflareSpeedTest, self._scheduler.add_job(func=self.__cloudflareSpeedTest,
trigger=CronTrigger.from_crontab(self._cron), trigger=CronTrigger.from_crontab(self._cron),
@ -390,7 +390,7 @@ class CloudflareSpeedTest(_PluginBase):
}) })
def get_state(self) -> bool: def get_state(self) -> bool:
return self._cf_ip and True if self._cron else False return True if self._cf_ip and self._cron else False
@staticmethod @staticmethod
def get_command() -> List[Dict[str, Any]]: def get_command() -> List[Dict[str, Any]]: