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

diff --git a/server.c b/server.c
index 2c66cc27..2852ee1f 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();
@@ -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);