🐛 Fix serve panics if splay is zero. (#1217)

Signed-off-by: Preslav <[email protected]>
mondoohq · Apr 2, 2024 · 7d0f974 · 7d0f974
1 parent eba0d80
commit 7d0f974
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/cnspec/cmd/backgroundjob/serve_unix.go b/apps/cnspec/cmd/backgroundjob/serve_unix.go
@@ -49,7 +49,11 @@ func Serve(timer time.Duration, splay time.Duration, handler JobRunner) {
 				if err != nil {
 					log.Error().Err(err).Send()
 				}
-				nextRun := timer + time.Duration(rand.Int63n(int64(splay)))
+				splayDur := time.Duration(0)
+				if splay > 0 {
+					splayDur = time.Duration(rand.Int63n(int64(splay)))
+				}
+				nextRun := timer + splayDur
 				log.Info().Msgf("next scan in %v", nextRun)
 				t.Reset(nextRun)
 			case <-shutdownChannel:

diff --git a/apps/cnspec/cmd/backgroundjob/serve_windows.go b/apps/cnspec/cmd/backgroundjob/serve_windows.go
@@ -80,7 +80,11 @@ loop:
 			default:
 				log.Error().Msg("scan not started. may be stuck")
 			}
-			nextRun := m.Timer + time.Duration(rand.Int63n(int64(m.Splay)))
+			splayDur := time.Duration(0)
+			if m.Splay > 0 {
+				splayDur = time.Duration(rand.Int63n(int64(m.Splay)))
+			}
+			nextRun := m.Timer + splayDur
 			log.Info().Msgf("next scan in %v", nextRun)
 			t.Reset(nextRun)
 		case c := <-r: