Browse Source

修复,修改扫描间隔没有生效的问题

Signed-off-by: allan716 <[email protected]>
allan716 3 years ago
parent
commit
da7aee91ba
2 changed files with 10 additions and 14 deletions
  1. 1 5
      cmd/chinesesubfinder/main.go
  2. 9 9
      internal/logic/cron_helper/cron_helper.go

+ 1 - 5
cmd/chinesesubfinder/main.go

@@ -25,11 +25,7 @@ func init() {
 
 func main() {
 
-	cronHelper, err := cron_helper.NewCronHelper()
-	if err != nil {
-		log_helper.GetLogger().Panicln("NewCronHelper " + err.Error())
-	}
-
+	cronHelper := cron_helper.NewCronHelper()
 	if settings.GetSettings().UserInfo.Username == "" || settings.GetSettings().UserInfo.Password == "" {
 		// 如果没有完成,那么就不开启
 		log_helper.GetLogger().Infoln("Need do Setup")

+ 9 - 9
internal/logic/cron_helper/cron_helper.go

@@ -20,23 +20,23 @@ type CronHelper struct {
 	dh                            *downloader_helper.DownloaderHelper
 }
 
-func NewCronHelper() (*CronHelper, error) {
+func NewCronHelper() *CronHelper {
 
 	ch := CronHelper{}
-	ch.c = cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
-	// 定时器
-	entryID, err := ch.c.AddFunc("@every "+settings.GetSettings().CommonSettings.ScanInterval, ch.coreSubDownloadProcess)
-	if err != nil {
-		log_helper.GetLogger().Errorln("CronHelper Cron entryID:", entryID, "Error:", err)
-		return nil, err
-	}
-	return &ch, nil
+	return &ch
 }
 
 // Start 开启定时器任务,这个任务是非阻塞的,coreSubDownloadProcess 仅仅可能是这个函数执行耗时而已
 // runImmediately == false 那么 ch.c.Start() 是不会阻塞的
 func (ch *CronHelper) Start(runImmediately bool) {
 
+	ch.c = cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
+	// 定时器
+	entryID, err := ch.c.AddFunc("@every "+settings.GetSettings().CommonSettings.ScanInterval, ch.coreSubDownloadProcess)
+	if err != nil {
+		log_helper.GetLogger().Panicln("CronHelper Cron entryID:", entryID, "Error:", err)
+	}
+
 	ch.cronHelperRunningLock.Lock()
 	ch.cronHelperRunning = true
 	ch.cronHelperRunningLock.Unlock()