WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 3d2d996

Browse files
tasks: iocscanner minor improvements
- stop scheduler properly. - skip closing channels for now.
1 parent 7a54845 commit 3d2d996

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

daemon/tasks/iocscanner/main.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@ func (pm *IOCScanner) Start(ctx context.Context, cancel context.CancelFunc) erro
113113
return fmt.Errorf("no tools configured")
114114
}
115115
for n, schedCfg := range pm.Config.Schedule {
116-
sched := scheduler.New(ctx, cancel, schedCfg)
117-
sched.Start()
118116
go func() {
117+
sched := scheduler.New(ctx, cancel, schedCfg)
118+
sched.Start()
119+
119120
for {
120121
select {
121122
case <-sched.Ctx.Done():
@@ -138,6 +139,7 @@ func (pm *IOCScanner) Start(ctx context.Context, cancel context.CancelFunc) erro
138139
}
139140
Exit:
140141
log.Debug("[IOCScanner] scheduler stopped")
142+
sched.Stop()
141143
}()
142144
}
143145

@@ -184,8 +186,8 @@ func (pm *IOCScanner) Stop() error {
184186
if pm.Cancel != nil {
185187
pm.Cancel()
186188
}
187-
close(pm.TaskBase.Results)
188-
close(pm.TaskBase.Errors)
189+
//close(pm.TaskBase.Results)
190+
//close(pm.TaskBase.Errors)
189191
return nil
190192
}
191193

daemon/tasks/scheduler/scheduler.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,8 @@ func (s *Scheduler) SetupDailyTimers() {
122122
}
123123

124124
func (s *Scheduler) Start() {
125-
if len(s.Tickers) > 0 {
126-
for _, t := range s.Tickers {
127-
if t != nil {
128-
t.Stop()
129-
}
130-
}
131-
if s.Cancel != nil {
132-
s.Cancel()
133-
}
134-
}
125+
log.Debug("[tasks-scheduler] Start()")
126+
135127
if len(s.Config.Time) > 0 {
136128
go s.SetupDailyTimers()
137129
}
@@ -230,9 +222,6 @@ func (s *Scheduler) Stop() {
230222
if s.Ticker != nil {
231223
s.Ticker.Stop()
232224
}
233-
if s.Cancel != nil {
234-
s.Cancel()
235-
}
236225
}
237226

238227
func (s *Scheduler) Tick() <-chan time.Time {

0 commit comments

Comments
 (0)