summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-04-12 00:01:27 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-04-12 00:01:27 -0400
commit24de3887e5e3bba2b8a4f60d1224ac927b98b1ed (patch)
tree20a27018a7fae78205e0bfee7fac4db4c82c0dea /systemd
parentc8f6735fce3d7ba5aa8019775d26b6999ed5a344 (diff)
stuff
- fix memory leaks (except for those from libusb) - fix graceful shutdown - fix systemd weirdness
Diffstat (limited to 'systemd')
-rw-r--r--systemd/freenect-server-http.service.in1
-rw-r--r--systemd/freenect-server.service.in8
-rw-r--r--systemd/freenect-server@.socket.in25
3 files changed, 3 insertions, 31 deletions
diff --git a/systemd/freenect-server-http.service.in b/systemd/freenect-server-http.service.in
index 8bb5b44..2aa97d7 100644
--- a/systemd/freenect-server-http.service.in
+++ b/systemd/freenect-server-http.service.in
@@ -17,7 +17,6 @@
Description=Kinect HTTP media streamer
After=network.target
Requires=freenect-server-http.socket freenect-server.service
-PartOf=freenect-server.service
After=freenect-server.service
[Service]
diff --git a/systemd/freenect-server.service.in b/systemd/freenect-server.service.in
index c6a719e..c0417b6 100644
--- a/systemd/freenect-server.service.in
+++ b/systemd/freenect-server.service.in
@@ -15,13 +15,11 @@
[Unit]
Description=Kinect media streamer backend
-After=network.target
-Requires=freenect-server@accel.mjson.socket freenect-server@depth.mjpg.socket freenect-server@video.mjpg.socket
[Service]
Type=simple
User=@user@
Group=@group@
-ExecStart=@bindir@/freenect-server -V systemd:freenect-server@video.mjpg.socket -D systemd:freenect-server@depth.mjpg.socket -A systemd:freenect-server@accel.mjson.socket
-
-Restart=always
+RuntimeDirectory=freenect-server
+ExecStartPre=/usr/bin/mkfifo /run/freenect-server/video.mjpg /run/freenect-server/depth.mjpg /run/freenect-server/accel.mjson
+ExecStart=@bindir@/freenect-server -v /run/freenect-server/video.mjpg -d /run/freenect-server/depth.mjpg -a /run/freenect-server/accel.mjson
diff --git a/systemd/freenect-server@.socket.in b/systemd/freenect-server@.socket.in
deleted file mode 100644
index 8be3205..0000000
--- a/systemd/freenect-server@.socket.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2016 Luke Shumaker
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-[Unit]
-Description=Kinect media streamer backend %I stream
-After=network.target
-
-[Socket]
-SocketUser=@user@
-SocketGroup=@group@
-ListenFIFO=/run/freenect-server/%I
-Service=freenect-server.service
-RemoveOnStop=true \ No newline at end of file