From 430f4087ef364481f58b7e3fa2d3267b09e954bb Mon Sep 17 00:00:00 2001
From: RobHooper <robh@linux.com>
Date: Mon, 13 Jul 2026 15:06:18 +0100
Subject: [PATCH 1/2] feat: restart scrapyd on failure

---
 salt/core/systemd/files/scrapyd.service | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/salt/core/systemd/files/scrapyd.service b/salt/core/systemd/files/scrapyd.service
index 6e2396c1..b8895f26 100644
--- a/salt/core/systemd/files/scrapyd.service
+++ b/salt/core/systemd/files/scrapyd.service
@@ -1,6 +1,9 @@
 [Unit]
 Description=Scrapyd
 After=network.target
+# https://github.com/open-contracting/deploy/issues/563
+StartLimitInterval=200
+StartLimitBurst=5
 
 [Service]
 User={{ user }}
@@ -18,6 +21,9 @@ WorkingDirectory={{ entry.appdir }}
 ExecStart={{ entry.appdir }}/.ve/bin/scrapyd --logfile=/var/log/scrapyd/scrapyd.log
 # https://github.com/open-contracting/kingfisher-collect/issues/606#issuecomment-953896571
 LimitNOFILE=512000
+# https://github.com/open-contracting/deploy/issues/563
+Restart=on-failure
+RestartSec=30
 
 [Install]
 WantedBy=multi-user.target

From 863fe390a7bada837fb01809e7b640618505b62f Mon Sep 17 00:00:00 2001
From: RobHooper <robh@linux.com>
Date: Tue, 14 Jul 2026 10:40:25 +0100
Subject: [PATCH 2/2] fix: apply changes from feedback

---
 salt/core/systemd/files/scrapyd.service | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/salt/core/systemd/files/scrapyd.service b/salt/core/systemd/files/scrapyd.service
index b8895f26..ab69bf64 100644
--- a/salt/core/systemd/files/scrapyd.service
+++ b/salt/core/systemd/files/scrapyd.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=Scrapyd
 After=network.target
-# https://github.com/open-contracting/deploy/issues/563
-StartLimitInterval=200
+StartLimitIntervalSec=300
 StartLimitBurst=5
 
 [Service]
@@ -19,11 +18,10 @@ Environment="no_proxy=localhost,sentry.io,open-contracting.org"
 {%- endif %}
 WorkingDirectory={{ entry.appdir }}
 ExecStart={{ entry.appdir }}/.ve/bin/scrapyd --logfile=/var/log/scrapyd/scrapyd.log
-# https://github.com/open-contracting/kingfisher-collect/issues/606#issuecomment-953896571
-LimitNOFILE=512000
-# https://github.com/open-contracting/deploy/issues/563
 Restart=on-failure
 RestartSec=30
+# https://github.com/open-contracting/kingfisher-collect/issues/606#issuecomment-953896571
+LimitNOFILE=512000
 
 [Install]
 WantedBy=multi-user.target