set default StartLimitIntervalSec of 1 day

aksiksi · Nov 6, 2023 · 02c3b67 · 02c3b67
1 parent d72b0ae
commit 02c3b67
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/compose.go b/compose.go
@@ -16,6 +16,10 @@ import (
 	"golang.org/x/exp/maps"
 )
 
+var (
+	defaultStartLimitIntervalSec = int((24 * time.Hour).Seconds())
+)
+
 // Examples:
 // nixose.systemd.service.RuntimeMaxSec=100
 // nixose.systemd.unit.StartLimitBurst=10
@@ -76,8 +80,10 @@ func parseRestartPolicyAndSystemdLabels(service *types.ServiceConfig) (*NixConta
 			if maxAttempts, err := strconv.ParseInt(maxAttemptsString, 10, 64); err != nil {
 				return nil, fmt.Errorf("failed to parse on-failure attempts: %q: %w", maxAttemptsString, err)
 			} else {
-				v := int(maxAttempts)
-				p.StartLimitBurst = &v
+				burst := int(maxAttempts)
+				p.StartLimitBurst = &burst
+				// Retry limit resets once per day.
+				p.StartLimitIntervalSec = &defaultStartLimitIntervalSec
 			}
 		} else {
 			return nil, fmt.Errorf("unsupported restart: %q", restart)
@@ -108,6 +114,9 @@ func parseRestartPolicyAndSystemdLabels(service *types.ServiceConfig) (*NixConta
 			if window := restartPolicy.Window; window != nil {
 				windowSecs := int(time.Duration(*window).Seconds())
 				p.StartLimitIntervalSec = &windowSecs
+			} else if p.StartLimitBurst != nil {
+				// Retry limit resets once per day by default.
+				p.StartLimitIntervalSec = &defaultStartLimitIntervalSec
 			}
 		}
 	}

diff --git a/testdata/TestDocker_WithProject_out.nix b/testdata/TestDocker_WithProject_out.nix
@@ -164,6 +164,7 @@
       Restart = "on-failure";
     };
     startLimitBurst = 3;
+    startLimitIntervalSec = 86400;
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";

diff --git a/testdata/TestDocker_out.nix b/testdata/TestDocker_out.nix
@@ -164,6 +164,7 @@
       Restart = "on-failure";
     };
     startLimitBurst = 3;
+    startLimitIntervalSec = 86400;
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";

diff --git a/testdata/TestPodman_WithProject_out.nix b/testdata/TestPodman_WithProject_out.nix
@@ -169,6 +169,7 @@
       Restart = "on-failure";
     };
     startLimitBurst = 3;
+    startLimitIntervalSec = 86400;
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";

diff --git a/testdata/TestPodman_out.nix b/testdata/TestPodman_out.nix
@@ -169,6 +169,7 @@
       Restart = "on-failure";
     };
     startLimitBurst = 3;
+    startLimitIntervalSec = 86400;
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";