Refactor systemd service to output karaf log

Signed-off-by: Ben Clark <ben@benjyc.uk>
openhab · Jul 19, 2017 · 3772481 · 3772481
1 parent 75aafe3
commit 3772481
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/resources/etc/default/openhab2 b/resources/etc/default/openhab2
@@ -29,3 +29,8 @@ EXTRA_JAVA_OPTS=""
 #
 #OPENHAB_USER=openhab
 #OPENHAB_GROUP=openhab
+#
+# The startmode for the openHAB runtime. Only available for systemctl/systemd systems.
+# Defaults to daemon when unset here.
+#
+#OPENHAB_STARTMODE=debug
diff --git a/resources/systemd/openhab2.service b/resources/systemd/openhab2.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=openHAB 2 - empowering the smart home
+Description=openHAB 2 - Empowering the smart home
 Documentation=http://docs.openhab.org
 Documentation=https://community.openhab.org
 Wants=network-online.target
@@ -11,15 +11,22 @@ Environment=OPENHAB_CONF=/etc/openhab2
 Environment=OPENHAB_RUNTIME=/usr/share/openhab2/runtime
 Environment=OPENHAB_USERDATA=/var/lib/openhab2
 Environment=OPENHAB_LOGDIR=/var/log/openhab2
+Environment=OPENHAB_STARTMODE=daemon
 EnvironmentFile=-/etc/default/openhab2
+
 User=openhab
 Group=openhab
+
 WorkingDirectory=/usr/share/openhab2
-ExecStart=/usr/share/openhab2/start.sh server
-ExecStop=/usr/share/openhab2/runtime/bin/stop
-# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
-TimeoutStopSec=120
+ExecStart=/usr/share/openhab2/runtime/bin/karaf $OPENHAB_STARTMODE
+ExecStop=/usr/share/openhab2/runtime/bin/karaf stop
+
+SuccessExitStatus=0 143
+RestartSec=5
 Restart=on-failure
+TimeoutStopSec=120
+
+LimitNOFILE=102642
 
 [Install]
 WantedBy=multi-user.target