X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=90dfc1f58962f69355775fd87e4c08f8253efeac;hp=98e208ac39d9212d67491faf0ad69e21af785128;hb=68f0d202714b85c9b5e649dcefc41df58fe8e31e;hpb=0a0a6201cd5ff86e106cc77f98a92b1d49f90054;ds=sidebyside diff --git a/server.c b/server.c index 98e208ac..90dfc1f5 100644 --- a/server.c +++ b/server.c @@ -205,7 +205,7 @@ static void shm_init(void) mmd->sender_cmd_data.cmd_num = -1; return; err_out: - PARA_EMERG_LOG("%s", para_strerror(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE); } @@ -263,12 +263,6 @@ static void parse_config(int override) server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } - /* logfile */ - if (!conf.logfile_given && conf.daemon_given) { - ret = -1; - PARA_EMERG_LOG("fatal: daemon option, but no log file given\n"); - goto out; - } if (conf.logfile_given) logfile = open_log(conf.logfile_arg); ret = 1; @@ -421,7 +415,7 @@ static unsigned server_init(int argc, char **argv) */ static void handle_sighup(void) { - PARA_NOTICE_LOG("%s", "SIGHUP\n"); + PARA_NOTICE_LOG("SIGHUP\n"); close_log(logfile); /* gets reopened if necessary by parse_config */ logfile = NULL; parse_config(1); /* reopens log */ @@ -554,7 +548,7 @@ genocide: random(); chld_pid = fork(); if (chld_pid < 0) { - PARA_CRIT_LOG("%s", "fork failed\n"); + PARA_CRIT_LOG("fork failed\n"); goto repeat; } if (chld_pid) {