Skip to content

Commit 2177ce4

Browse files
andrewgeeapplethepeanut
authored andcommitted
Add kill timeout to SystemD service as TimeoutStopSec (#1156)
Co-authored-by: Andrew Smitherim <[email protected]>
1 parent 23583eb commit 2177ce4

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd/start-template

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ExecReload=/bin/kill -HUP $MAINPID
1111
Restart=always
1212
RestartSec=${{retryTimeout}}
1313
SuccessExitStatus=${{SuccessExitStatus}}
14+
TimeoutStopSec=${{TimeoutStopSec}}
1415
User=${{daemon_user}}
1516
ExecStartPre=/bin/mkdir -p /run/${{app_name}}
1617
ExecStartPre=/bin/chown ${{daemon_user}}:${{daemon_group}} /run/${{app_name}}

src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import sbt._
44
import sbt.Keys.{sourceDirectory, target}
55
import com.typesafe.sbt.packager.Keys.{
66
defaultLinuxStartScriptLocation,
7+
killTimeout,
78
linuxMakeStartScript,
89
linuxPackageMappings,
910
linuxScriptReplacements,
@@ -58,7 +59,8 @@ object SystemdPlugin extends AutoPlugin {
5859
isConf = true
5960
),
6061
// add additional system configurations to script replacements
61-
linuxScriptReplacements += ("SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" "))
62+
linuxScriptReplacements += ("SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" ")),
63+
linuxScriptReplacements += ("TimeoutStopSec" -> killTimeout.value.toString)
6264
)
6365

6466
def debianSettings: Seq[Setting[_]] = inConfig(Debian)(defaultLinuxStartScriptLocation := "/lib/systemd/system")

0 commit comments

Comments
 (0)