add top-level notification timeout

It used to make or extend the context of service.notify
umputun · Oct 27, 2023 · 60181eb · 60181eb
1 parent a1b5c1d
commit 60181eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -188,7 +188,7 @@ notify:
       --notify.telegram-token=        API token for the Telegram bot [$CRONN_NOTIFY_TELEGRAM_TOKEN]
       --notify.telegram-destinations= List of Telegram chat IDs the bot will post messages to [$CRONN_NOTIFY_TELEGRAM_DESTINATIONS]
       --notify.webhook-urls=          List of webhook URLs the bot will post messages to [$CRONN_NOTIFY_WEBHOOK_URLS]
-
+      --noify.timeout=                timeout for notifications (default: 10s) [$TIMEOUT]
 log:
       --log.enabled               enable logging [$CRONN_LOG_ENABLED]
       --log.debug                 debug mode [$CRONN_LOG_DEBUG]

diff --git a/app/main.go b/app/main.go
@@ -64,6 +64,7 @@ var opts struct {
 		TelegramToken        string        `long:"telegram-token" env:"TELEGRAM_TOKEN" description:"API token for the Telegram bot"`
 		TelegramDestinations []string      `long:"telegram-destinations" env:"TELEGRAM_DESTINATIONS" description:"List of Telegram chat IDs the bot will post messages to" env-delim:","`
 		WebhookURLs          []string      `long:"webhook-urls" env:"WEBHOOK_URLS" description:"List of webhook URLs the bot will post messages to" env-delim:","`
+		TimeOut              time.Duration `long:"timeout" env:"TIMEOUT" default:"10s" description:"timeout for notification"`
 	} `group:"notify" namespace:"notify" env-namespace:"CRONN_NOTIFY"`
 
 	Log struct {
@@ -141,6 +142,7 @@ func main() {
 		EnableLogPrefix:   opts.Log.EnablePrefix,
 		Stdout:            stdout,
 		DeDup:             service.NewDeDup(opts.DeDup),
+		NotifyTimeout:     opts.Notify.TimeOut,
 	}
 
 	cronService.Do(ctx)

diff --git a/app/service/service.go b/app/service/service.go
@@ -27,7 +27,8 @@ import (
 //go:generate moq -out mocks/repeater.go -pkg mocks -skip-ensure -fmt goimports . Repeater
 //go:generate moq -out mocks/schedule.go -pkg mocks -skip-ensure -fmt goimports . Schedule
 
-// Scheduler is a top-level service wiring cron, resumer ans parser and provifing the main entry point (blocking) to start the process
+// Scheduler is a top-level service wiring cron, resumer ans parser and provifing the main entry point (blocking)
+// to start the process
 type Scheduler struct {
 	Cron
 	Resumer           Resumer
@@ -42,6 +43,7 @@ type Scheduler struct {
 	EnableLogPrefix   bool
 	Repeater          Repeater
 	Stdout            io.Writer
+	NotifyTimeout     time.Duration
 }
 
 // Resumer defines interface for resumer.Resumer providing auto-restart for failed jobs
@@ -151,7 +153,9 @@ func (s *Scheduler) jobFunc(r crontab.JobSpec, sched Schedule) cron.FuncJob {
 		}
 
 		if err = s.executeCommand(cmd, s.Stdout); err != nil {
-			if e := s.notify(context.TODO(), r, err.Error()); e != nil {
+			ctxTimeout, cancel := context.WithTimeout(context.Background(), s.NotifyTimeout)
+			defer cancel()
+			if e := s.notify(ctxTimeout, r, err.Error()); e != nil {
 				return fmt.Errorf("failed to notify: %w", err)
 			}
 			return err
@@ -202,7 +206,6 @@ func (s *Scheduler) executeCommand(command string, logWriter io.Writer) error {
 }
 
 func (s *Scheduler) notify(ctx context.Context, r crontab.JobSpec, errMsg string) error {
-
 	if s.Notifier == nil || reflect.ValueOf(s.Notifier).IsNil() {
 		return nil
 	}
@@ -282,7 +285,9 @@ func (s *Scheduler) resumeInterrupted(concur int) {
 			gr.Go(func(ctx context.Context) {
 				if err := s.executeCommand(cmd.Command, s.Stdout); err != nil {
 					r := crontab.JobSpec{Spec: "auto-resume", Command: cmd.Command}
-					if e := s.notify(ctx, r, err.Error()); e != nil {
+					ctxTimeout, cancel := context.WithTimeout(ctx, s.NotifyTimeout)
+					defer cancel()
+					if e := s.notify(ctxTimeout, r, err.Error()); e != nil {
 						log.Printf("[WARN] failed to notify, %v", e)
 						return
 					}