Ema has submitted this change and it was merged.
Change subject: Automatically restart varnish statistics daemons
......................................................................
Automatically restart varnish statistics daemons
Bug: T132430
Change-Id: I2002d7cbf2130ac459bb38c199c925718d24b975
---
M modules/varnish/templates/initscripts/varnishmedia.systemd.erb
M modules/varnish/templates/initscripts/varnishreqstats.systemd.erb
M modules/varnish/templates/initscripts/varnishrls.systemd.erb
M modules/varnish/templates/initscripts/varnishstatsd.systemd.erb
M modules/varnish/templates/initscripts/varnishxcps.systemd.erb
5 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/varnish/templates/initscripts/varnishmedia.systemd.erb
b/modules/varnish/templates/initscripts/varnishmedia.systemd.erb
index 982573d..1270cdb 100644
--- a/modules/varnish/templates/initscripts/varnishmedia.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnishmedia.systemd.erb
@@ -4,6 +4,8 @@
[Service]
ExecStart=/usr/local/bin/varnishmedia --statsd-server=<%= @statsd_server %>
+Restart=always
+RestartSec=5s
[Install]
WantedBy=multi-user.target
diff --git a/modules/varnish/templates/initscripts/varnishreqstats.systemd.erb
b/modules/varnish/templates/initscripts/varnishreqstats.systemd.erb
index f06cf27..63b132a 100644
--- a/modules/varnish/templates/initscripts/varnishreqstats.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnishreqstats.systemd.erb
@@ -5,6 +5,8 @@
[Service]
ExecStart=/usr/local/bin/varnishreqstats <%= /\w/.match(@instance_name) ?
"--varnish-name=#{@instance_name}" : "" %> --statsd=<%= @statsd %>
--metric-prefix=<%= @metric_prefix %> --interval=<%= @interval %>
+Restart=always
+RestartSec=5s
[Install]
WantedBy=multi-user.target
diff --git a/modules/varnish/templates/initscripts/varnishrls.systemd.erb
b/modules/varnish/templates/initscripts/varnishrls.systemd.erb
index e760fd3..d215300 100644
--- a/modules/varnish/templates/initscripts/varnishrls.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnishrls.systemd.erb
@@ -4,6 +4,8 @@
[Service]
ExecStart=/usr/local/bin/varnishrls --statsd-server=<%= @statsd_server %>
+Restart=always
+RestartSec=5s
[Install]
WantedBy=multi-user.target
diff --git a/modules/varnish/templates/initscripts/varnishstatsd.systemd.erb
b/modules/varnish/templates/initscripts/varnishstatsd.systemd.erb
index 0a401da..b749a50 100644
--- a/modules/varnish/templates/initscripts/varnishstatsd.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnishstatsd.systemd.erb
@@ -4,6 +4,8 @@
[Service]
ExecStart=/usr/local/bin/varnishstatsd <%= /\w/.match(@instance_name) ?
"--varnish-instance_name=#{@instance_name}" : "" %> --statsd-server=<%=
@statsd_server %> --key-prefix=<%= @key_prefix %>
+Restart=always
+RestartSec=5s
[Install]
WantedBy=multi-user.target
diff --git a/modules/varnish/templates/initscripts/varnishxcps.systemd.erb
b/modules/varnish/templates/initscripts/varnishxcps.systemd.erb
index bcd9184..6736ec6 100644
--- a/modules/varnish/templates/initscripts/varnishxcps.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnishxcps.systemd.erb
@@ -4,6 +4,8 @@
[Service]
ExecStart=/usr/local/bin/varnishxcps --statsd-server=<%= @statsd_server %>
+Restart=always
+RestartSec=5s
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/282965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2002d7cbf2130ac459bb38c199c925718d24b975
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
