X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=ea9cc9c003616762a96aa546c381d54417fd34a2;hp=2c66cc279c9faa99e009ae747fd4d8a54738e2e8;hb=HEAD;hpb=cdbc8067a2e27ee7f9e0d8ff11cf415603fc0558

diff --git a/server.c b/server.c
index 2c66cc27..ea9cc9c0 100644
--- a/server.c
+++ b/server.c
@@ -172,6 +172,7 @@ static void init_ipc_or_die(void)
 	mmd->active_connections = 0;
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
+	mmd->loglevel = OPT_UINT32_VAL(LOGLEVEL);
 	return;
 destroy_mmd_mutex:
 	mutex_destroy(mmd_mutex);
@@ -180,6 +181,9 @@ err_out:
 	exit(EXIT_FAILURE);
 }
 
+/** Get a reference to the supercommand of para_server. */
+#define CMD_PTR (lls_cmd(0, server_suite))
+
 /**
  * (Re-)read the server configuration files.
  *
@@ -205,7 +209,7 @@ void parse_config_or_die(bool reload)
 			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	if (OPT_GIVEN(LOGFILE)) {
 		daemon_set_logfile(OPT_STRING_VAL(LOGFILE));
 		daemon_open_log_or_die();
@@ -432,14 +436,14 @@ static void init_server_command_task(struct server_command_task *sct,
 	sct->argv = argv;
 	if (!OPT_GIVEN(LISTEN_ADDRESS)) {
 		sct->num_listen_fds = 1;
-		sct->listen_fds = para_malloc(sizeof(int));
+		sct->listen_fds = alloc(sizeof(int));
 		ret = para_listen_simple(IPPROTO_TCP, port);
 		if (ret < 0)
 			goto err;
 		sct->listen_fds[0] = ret;
 	} else {
 		sct->num_listen_fds = OPT_GIVEN(LISTEN_ADDRESS);
-		sct->listen_fds = para_malloc(sct->num_listen_fds * sizeof(int));
+		sct->listen_fds = alloc(sct->num_listen_fds * sizeof(int));
 		for (n = 0; n < OPT_GIVEN(LISTEN_ADDRESS); n++) {
 			const char *arg;
 			arg = lls_string_val(n, OPT_RESULT(LISTEN_ADDRESS));
@@ -543,7 +547,7 @@ static void server_init(int argc, char **argv, struct server_command_task *sct)
 	if (ret < 0)
 		goto fail;
 	server_lpr = cmdline_lpr;
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
 		OPT_STRING_VAL(GROUP));
 	version_handle_flag("server", OPT_GIVEN(VERSION));
@@ -621,6 +625,7 @@ static int server_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
 	int ret;
 
+	daemon_set_loglevel(mmd->loglevel);
 	status_refresh();
 	mutex_unlock(mmd_mutex);
 	ret = xpoll(fds, nfds, timeout);