Add stop timeout to systemd services

szTheory · May 12, 2016 · 42a2bcc · 42a2bcc
1 parent 1f96da0
commit 42a2bcc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/data/export/systemd/process.service.erb b/data/export/systemd/process.service.erb
@@ -13,3 +13,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+TimeoutStopSec=<%= engine.options[:timeout] %>
diff --git a/lib/foreman/cli.rb b/lib/foreman/cli.rb
@@ -51,6 +51,7 @@ def start(process=nil)
   method_option :user,        :type => :string,  :aliases => "-u"
   method_option :template,    :type => :string,  :aliases => "-t"
   method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"', :desc => 'Specify what processes will run and how many. Default: "all=1"'
+  method_option :timeout,     :type => :numeric, :aliases => "-t", :desc => "Specify the amount of time (in seconds) processes have to shutdown gracefully before receiving a SIGKILL, defaults to 5."
 
   def export(format, location=nil)
     check_procfile!

diff --git a/spec/resources/export/systemd/[email protected] b/spec/resources/export/systemd/[email protected]
@@ -12,3 +12,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+TimeoutStopSec=5
diff --git a/spec/resources/export/systemd/[email protected] b/spec/resources/export/systemd/[email protected]
@@ -12,3 +12,4 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=%n
 KillMode=process
+TimeoutStopSec=5