X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=31d29c73dc5595c881173abe4eea892854b1f6a3;hp=2595d9c4edaf649e9843150697855cbfe0c8d555;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/server.c b/server.c
index 2595d9c4..31d29c73 100644
--- a/server.c
+++ b/server.c
@@ -67,7 +67,6 @@
  */
 
 #include <signal.h>
-#include <sys/time.h>
 #include <regex.h>
 #include <osl.h>
 
@@ -237,13 +236,13 @@ void parse_config_or_die(int override)
 			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
 		conf.daemon_given = tmp;
 	}
 	if (conf.logfile_given) {
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
 	}
-	daemon_set_loglevel(conf.loglevel_arg);
 	init_colors_or_die();
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
@@ -279,13 +278,13 @@ static void handle_sighup(void)
 		kill(mmd->afs_pid, SIGHUP);
 }
 
-static void signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
 {
 	int signum = para_next_signal(&s->rfds);
 
 	switch (signum) {
 	case 0:
-		return;
+		return 0;
 	case SIGHUP:
 		handle_sighup();
 		break;
@@ -330,6 +329,7 @@ cleanup:
 		shm_detach(mmd);
 		exit(EXIT_FAILURE);
 	}
+	return 0;
 }
 
 static void init_signal_task(void)
@@ -358,7 +358,7 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
 	struct server_command_task *sct = container_of(t, struct server_command_task, task);
 
@@ -392,7 +392,7 @@ static void command_post_select(struct sched *s, struct task *t)
 	if (child_pid) {
 		close(new_fd);
 		/* parent keeps accepting connections */
-		return;
+		return 0;
 	}
 	/* mmd might already have changed at this point */
 	free(chunk_table);
@@ -406,10 +406,12 @@ static void command_post_select(struct sched *s, struct task *t)
 	for (i = sct->argc - 1; i >= 0; i--)
 		memset(sct->argv[i], 0, strlen(sct->argv[i]));
 	sprintf(sct->argv[0], "para_server (serving %s)", peer_name);
-	return handle_connect(new_fd, peer_name);
+	handle_connect(new_fd, peer_name);
+	/* never reached*/
 out:
 	if (ret < 0)
 		PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+	return 0;
 }
 
 static void init_server_command_task(int argc, char **argv)
@@ -488,12 +490,13 @@ static void server_init(int argc, char **argv)
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_set_loglevel(conf.loglevel_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);
 	log_welcome("para_server");
 	init_ipc_or_die(); /* init mmd struct and mmd->lock */
 	/* make sure, the global now pointer is uptodate */
-	gettimeofday(now, NULL);
+	clock_get_realtime(now);
 	set_server_start_time(now);
 	init_user_list(user_list_file);
 	/* become daemon */