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.

Mans Rullgard committed 14 years ago

Commit ada51a31 parent 9eded0f4 files · +2 −48Browse files

Unified · Split

4 files

Changelog +1 −0
avserver.c +0 −38
doc/avserver.conf +0 −3
doc/avserver.texi +1 −7

Changelog+1−0

@@ -9,6 +9,7 @@ version <next>: · 8 unmodified lines
9	version 9_beta2:	9	version 9_beta2:
10	- metadata (INFO tag) support in WAV muxer	10	- metadata (INFO tag) support in WAV muxer
11	- support for building DLLs using MSVC	11	- support for building DLLs using MSVC
		12	- remove avserver daemon mode
12		13
13		14
14	version 9_beta1:	15	version 9_beta1:

avserver.c+0−38

                              HTTPContext *rtsp_c);
 static const char *my_program_name;
-static const char *my_program_dir;
 static const char *config_filename = "/etc/avserver.conf";
 static int avserver_debug;
-static int avserver_daemon;
 static int no_launch;
 static int need_to_start_children;
                     }
                 }
-                /* This is needed to make relative pathnames work */
-                chdir(my_program_dir);
                 signal(SIGPIPE, SIG_DFL);
                 execvp(pathname, feed->child_argv);
             if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
                 ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
             }
-        } else if (!av_strcasecmp(cmd, "NoDaemon")) {
-            avserver_daemon = 0;
         } else if (!av_strcasecmp(cmd, "RTSPPort")) {
             get_arg(arg, sizeof(arg), &p);
             val = atoi(arg);
 static void opt_debug(void)
 {
     avserver_debug = 1;
-    avserver_daemon = 0;
     logfilename[0] = '-';
 }
     show_banner();
     my_program_name = argv[0];
-    my_program_dir = getcwd(0, 0);
-    avserver_daemon = 1;
     parse_options(NULL, argc, argv, options, NULL);
     compute_bandwidth();
-    /* put the process in background and detach it from its TTY */
-    if (avserver_daemon) {
-        int pid;
-        pid = fork();
-        if (pid < 0) {
-            perror("fork");
-            exit(1);
-        } else if (pid > 0) {
-            /* parent : exit */
-            exit(0);
-        } else {
-            /* child */
-            setsid();
-            close(0);
-            open("/dev/null", O_RDWR);
-            if (strcmp(logfilename, "-") != 0) {
-                close(1);
-                dup(0);
-            }
-            close(2);
-            dup(0);
-        }
-    }
     /* signal init */
     signal(SIGPIPE, SIG_IGN);
-    if (avserver_daemon)
-        chdir("/");
     if (http_server() < 0) {
         http_log("Could not start server\n");
         exit(1);

doc/avserver.conf+0−3

@@ -25,9 +25,6 @@ MaxBandwidth 1000 · 24 unmodified lines
25	# '-' is the standard output.	25	# '-' is the standard output.
26	CustomLog -	26	CustomLog -
27		27
28	# Suppress that if you want to launch avserver as a daemon.
29	NoDaemon
30
31		28
32	##################################################################	29	##################################################################
33	# Definition of the live feeds. Each live feed contains one video	30	# Definition of the live feeds. Each live feed contains one video

doc/avserver.texi+1−7

@@ -31,11 +31,6 @@ several live feeds, streaming from files and time shifting on live feeds · 30 unmodified lines
31	(you can seek to positions in the past on each live feed, provided you	31	(you can seek to positions in the past on each live feed, provided you
32	specify a big enough feed storage in avserver.conf).	32	specify a big enough feed storage in avserver.conf).
33		33
34	avserver runs in daemon mode by default; that is, it puts itself in
35	the background and detaches from its TTY, unless it is launched in
36	debug mode or a NoDaemon option is specified in the configuration
37	file.
38
39	This documentation covers only the streaming aspects of avserver /	34	This documentation covers only the streaming aspects of avserver /
40	avconv. All questions about parameters for avconv, codec questions,	35	avconv. All questions about parameters for avconv, codec questions,
41	etc. are not covered here. Read @file{avconv.html} for more	36	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 · 215 unmodified lines
257	any avconv instances, you will have to launch them manually.	252	any avconv instances, you will have to launch them manually.
258	@item -d	253	@item -d
259	Enable debug mode. This option increases log verbosity, directs log	254	Enable debug mode. This option increases log verbosity, directs log
260	messages to stdout and causes avserver to run in the foreground	255	messages to stdout.
261	rather than as a daemon.
262	@end table	256	@end table
263	@c man end	257	@c man end
264		258

avserver: remove daemon mode

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code