summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-04-25 12:08:54 +0000
committerJanne Grunau <janne-libav@jannau.net>2012-11-15 17:36:14 +0100
commitada51a334aeb1e378fe852c8b5eede9cbbd05f69 (patch)
treed541ae47107863e9987bb52507dc8ed6381d6db0 /doc
parent9eded0fe412e610ee8944681d5c554b723463e96 (diff)
avserver: remove daemon mode
This code spews a multitude of warnings with glibc (unchecked return values), some of them possibly warranted. Furthermore, the deamonisation is not suitable for use with typical startup scripts as it does not provide the PID of the daemon in any way. Users wishing to run avserver as a daemon can still do so using start-stop-daemon or equivalent tools. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'doc')
-rw-r--r--doc/avserver.conf3
-rw-r--r--doc/avserver.texi8
2 files changed, 1 insertions, 10 deletions
diff --git a/doc/avserver.conf b/doc/avserver.conf
index e9724bbf99..e1cd9fb126 100644
--- a/doc/avserver.conf
+++ b/doc/avserver.conf
@@ -25,9 +25,6 @@ MaxBandwidth 1000
# '-' is the standard output.
CustomLog -
-# Suppress that if you want to launch avserver as a daemon.
-NoDaemon
-
##################################################################
# Definition of the live feeds. Each live feed contains one video
diff --git a/doc/avserver.texi b/doc/avserver.texi
index c023814e08..88e6221f6a 100644
--- a/doc/avserver.texi
+++ b/doc/avserver.texi
@@ -31,11 +31,6 @@ several live feeds, streaming from files and time shifting on live feeds
(you can seek to positions in the past on each live feed, provided you
specify a big enough feed storage in avserver.conf).
-avserver runs in daemon mode by default; that is, it puts itself in
-the background and detaches from its TTY, unless it is launched in
-debug mode or a NoDaemon option is specified in the configuration
-file.
-
This documentation covers only the streaming aspects of avserver /
avconv. All questions about parameters for avconv, codec questions,
etc. are not covered here. Read @file{avconv.html} for more
@@ -257,8 +252,7 @@ within the various <Stream> sections. Since avserver will not launch
any avconv instances, you will have to launch them manually.
@item -d
Enable debug mode. This option increases log verbosity, directs log
-messages to stdout and causes avserver to run in the foreground
-rather than as a daemon.
+messages to stdout.
@end table
@c man end