refactored executor code

Author: gbenroscience

main/main.exe

@@ -14,7 +14,7 @@ func timeStampMillis() int {
 func main() {
 
 	totalCount := 0
-	const MAX_CYCLES = 5
+	const MAX_CYCLES = 10
 
 	sc := utils.NewTimedExecutor(2*time.Second, 500*time.Millisecond)
 

main/main.go

@@ -9,74 +9,60 @@ import (
 )
 
 type ScheduledExecutor struct {
-	delay    time.Duration
-	ticker   time.Ticker
-	sigs     chan os.Signal
-	shutdown bool
+	delay  time.Duration
+	ticker *time.Ticker
+	sigs   chan os.Signal
+	ctx    context.Context
+	cancel context.CancelFunc
 }
 
-func NewTimedExecutor(initialDelay time.Duration, delay time.Duration) ScheduledExecutor {
-	return ScheduledExecutor{
-		delay:  delay,
-		ticker: *time.NewTicker(initialDelay),
+func NewTimedExecutor(initialDelay time.Duration, delay time.Duration) *ScheduledExecutor {
+	return &ScheduledExecutor{
+		delay: delay,
 	}
 }
 
-// Start .. process() is the function to run periodically , runAsync detects if the function should block the executor when running or not. It blocks when false
 func (se *ScheduledExecutor) Start(task func(), runAsync bool) {
-	// Create a context that can be cancelled
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	se.shutdown = false
+	se.ctx, se.cancel = context.WithCancel(context.Background())
 	se.sigs = make(chan os.Signal, 1)
 	signal.Notify(se.sigs, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
-		<-se.sigs // Block until a signal is received
-		cancel()
-	}()
-
-	firstExec := true
-
-	defer func() {
-		se.close()
-		close(se.sigs)
-	}()
-	for {
-		if se.shutdown {
+		select {
+		case <-se.sigs:
+			se.cancel()
+		case <-se.ctx.Done():
 			return
 		}
-		select {
-		case <-se.ticker.C:
+	}()
 
-			if firstExec {
-				se.ticker.Stop()
-				se.ticker = *time.NewTicker(se.delay)
-				firstExec = false
-			}
+	go func() {
+		time.Sleep(se.delay)
+		se.ticker = time.NewTicker(se.delay)
+		defer se.ticker.Stop()
 
-			if runAsync {
-				go task()
-			} else {
-				task()
-			}
-		case <-ctx.Done():
-			return
-		default:
-			if se.shutdown {
+		for {
+			select {
+			case <-se.ticker.C:
+				if runAsync {
+					go task()
+				} else {
+					task()
+				}
+			case <-se.ctx.Done():
 				return
 			}
 		}
-	}
-
-}
+	}()
 
-func (se *ScheduledExecutor) Close() error {
-	se.shutdown = true
-	return nil
+	<-se.ctx.Done()
 }
 
-func (se *ScheduledExecutor) close() {
-	se.ticker.Stop()
+func (se *ScheduledExecutor) Close() {
+	if se.cancel != nil {
+		se.cancel()
+	}
+	if se.ticker != nil {
+		se.ticker.Stop()
+	}
 }