X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=7cb6e5200fa696471e7baaf5a4ee121cdef47755;hp=97a172050b59a8f70a49bb45ce0c358fb36dc3df;hb=cd5857fba9718ecf12dec5bba800f48851d8ab42;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/server.c b/server.c
index 97a17205..7cb6e520 100644
--- a/server.c
+++ b/server.c
@@ -7,16 +7,13 @@
 /** \file server.c Paraslash's main server. */
 
 /**
- * \mainpage Main data structures:
+ * \mainpage Main data structures and selected APIs:
  *
- *	- Server: \ref server_command, \ref sender,
+ *	- Senders: \ref sender,
  *	- Audio file selector: \ref afs_info, \ref afs_table,
  *	- Audio format handler: \ref audio_format_handler, \ref afh_info
  *	- Receivers/filters/writers: \ref receiver, \ref receiver_node,
  *	  \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *
- * Selected APIs:
- *
  *	- Scheduling: \ref sched.h,
  *	- Buffer trees: \ref buffer_tree.h,
  *	- Sideband API: \ref sideband.h,
@@ -29,7 +26,7 @@
  *	- Interactive sessions: \ref interactive.h,
  *	- File descriptors: \ref fd.h,
  *	- Signals: \ref signal.h,
- * 	- Networking: \ref net.h,
+ *	- Networking: \ref net.h,
  *	- Time: \ref time.c,
  *	- Doubly linked lists: \ref list.h.
  */
@@ -78,7 +75,7 @@ INIT_SERVER_ERRLISTS;
 
 /**
  * Pointer to shared memory area for communication between para_server
- * and its children. Exported to vss.c. command.c and to afs.
+ * and its children. Exported to vss.c, command.c and to afs.
  */
 struct misc_meta_data *mmd;
 
@@ -100,6 +97,7 @@ int mmd_mutex;
 static char *user_list_file = NULL;
 
 static struct sched sched;
+static struct signal_task *signal_task;
 
 /** The task responsible for server command handling. */
 struct server_command_task {
@@ -126,29 +124,6 @@ char *server_get_tasks(void)
 	return get_task_list(&sched);
 }
 
-static int want_colors(void)
-{
-	if (conf.color_arg == color_arg_no)
-		return 0;
-	if (conf.color_arg == color_arg_yes)
-		return 1;
-	if (conf.logfile_given)
-		return 0;
-	return isatty(STDERR_FILENO);
-}
-
-static void init_colors_or_die(void)
-{
-	int i;
-
-	if (!want_colors())
-		return;
-	daemon_set_flag(DF_COLOR_LOG);
-	daemon_set_default_log_colors();
-	for (i = 0; i < conf.log_color_given; i++)
-		daemon_set_log_color_or_die(conf.log_color_arg[i]);
-}
-
 /*
  * setup shared memory area and get mutex for locking
  */
@@ -231,7 +206,9 @@ void parse_config_or_die(int override)
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
 	}
-	init_colors_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);
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
 	daemon_set_flag(DF_LOG_TIME);
@@ -248,12 +225,6 @@ out:
 	exit(EXIT_FAILURE);
 }
 
-static void signal_pre_select(struct sched *s, void *context)
-{
-	struct signal_task *st = context;
-	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
-}
-
 /*
  * called when server gets SIGHUP or when client invokes hup command.
  */
@@ -322,22 +293,18 @@ cleanup:
 
 static void init_signal_task(void)
 {
-	static struct signal_task signal_task_struct,
-		*st = &signal_task_struct;
-
-	PARA_NOTICE_LOG("setting up signal handling\n");
-	st->fd = para_signal_init(); /* always successful */
+	signal_task = signal_init_or_die();
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGHUP);
 	para_install_sighandler(SIGCHLD);
 	para_sigaction(SIGPIPE, SIG_IGN);
-	add_close_on_fork_list(st->fd);
-	st->task = task_register(&(struct task_info) {
+	add_close_on_fork_list(signal_task->fd);
+	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
 		.pre_select = signal_pre_select,
 		.post_select = signal_post_select,
-		.context = st,
+		.context = signal_task,
 
 	}, &sched);
 }
@@ -391,7 +358,7 @@ static int command_post_select(struct sched *s, void *context)
 	free(chunk_table);
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
-	para_signal_shutdown();
+	signal_shutdown(signal_task);
 	/*
 	 * put info on who we are serving into argv[0] to make
 	 * client ip visible in top/ps
@@ -499,7 +466,7 @@ static void server_init(int argc, char **argv)
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);
-	daemon_log_welcome("para_server");
+	daemon_log_welcome("server");
 	init_ipc_or_die(); /* init mmd struct and mmd->lock */
 	daemon_set_start_time();
 	init_user_list(user_list_file);