check if context has a deadline (#146)

caddyserver · Jun 25, 2023 · 4227917 · 4227917
1 parent c9644d6
commit 4227917
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/environment.go b/environment.go
@@ -242,8 +242,13 @@ func parseAndAppendFlags(cmd *exec.Cmd, flags string) *exec.Cmd {
 }
 
 func (env environment) runCommand(ctx context.Context, cmd *exec.Cmd) error {
-	deadline, _ := ctx.Deadline()
-	log.Printf("[INFO] exec (timeout=%s): %+v ", time.Until(deadline), cmd)
+	deadline, ok := ctx.Deadline()
+	var timeout time.Duration
+	// context doesn't necessarily have a deadline
+	if ok {
+		timeout = time.Until(deadline)
+	}
+	log.Printf("[INFO] exec (timeout=%s): %+v ", timeout, cmd)
 
 	// start the command; if it fails to start, report error immediately
 	err := cmd.Start()