X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=ca71c4d8860e49224ffd0f2203ed76a7253a1a01;hp=71a9ec505f6d096a1dc589a9cdf6c1f484e5090d;hb=0b6e7a20c19d642f9d8e65683e1525c91dd3de39;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3

diff --git a/server.c b/server.c
index 71a9ec50..ca71c4d8 100644
--- a/server.c
+++ b/server.c
@@ -207,8 +207,12 @@ void parse_config_or_die(int override)
 		daemon_open_log_or_die();
 	}
 
-	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
-		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
+	if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+			conf.logfile_given)) {
+		int i;
+		for (i = 0; i < conf.log_color_given; i++)
+			daemon_set_log_color_or_die(conf.log_color_arg[i]);
+	}
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
 	daemon_set_flag(DF_LOG_TIME);
@@ -407,8 +411,9 @@ static int init_afs(int argc, char **argv)
 {
 	int ret, afs_server_socket[2];
 	pid_t afs_pid;
+	char c;
 
-	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
+	ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
@@ -418,6 +423,7 @@ static int init_afs(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	if (afs_pid == 0) { /* child (afs) */
 		int i;
+
 		for (i = argc - 1; i >= 0; i--)
 			memset(argv[i], 0, strlen(argv[i]));
 		sprintf(argv[0], "para_server (afs)");
@@ -426,6 +432,10 @@ static int init_afs(int argc, char **argv)
 	}
 	mmd->afs_pid = afs_pid;
 	close(afs_server_socket[1]);
+	if (read(afs_server_socket[0], &c, 1) <= 0) {
+		PARA_EMERG_LOG("early afs exit\n");
+		exit(EXIT_FAILURE);
+	}
 	ret = mark_fd_nonblocking(afs_server_socket[0]);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
@@ -453,7 +463,7 @@ static void server_init(int argc, char **argv)
 		.check_ambiguity = 0,
 		.print_errors = 1
 	};
-	int afs_socket;
+	int afs_socket, daemon_pipe = -1;
 
 	valid_fd_012();
 	init_random_seed_or_die();
@@ -473,7 +483,7 @@ static void server_init(int argc, char **argv)
 	init_user_list(user_list_file);
 	/* become daemon */
 	if (conf.daemon_given)
-		daemonize(true /* parent waits for SIGTERM */);
+		daemon_pipe = daemonize(true /* parent waits for us */);
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 
@@ -499,8 +509,13 @@ static void server_init(int argc, char **argv)
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket, &sched);
 	init_server_command_task(argc, argv);
-	if (conf.daemon_given)
-		kill(getppid(), SIGTERM);
+	if (daemon_pipe >= 0) {
+		if (write(daemon_pipe, "\0", 1) < 0) {
+			PARA_EMERG_LOG("daemon_pipe: %s", strerror(errno));
+			exit(EXIT_FAILURE);
+		}
+		close(daemon_pipe);
+	}
 	PARA_NOTICE_LOG("server init complete\n");
 }