X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=e3e3bd9acd9b2ccd771fc359f4e57ae24dbe5cce;hp=d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=e065f3eec9be99d82da855bf3da38d8e86752fef diff --git a/audiod.c b/audiod.c index d2c66f2b..e3e3bd9a 100644 --- a/audiod.c +++ b/audiod.c @@ -343,10 +343,11 @@ static void parse_config_or_die(void) PARA_EMERG_LOG("can not read config file %s\n", config_file); goto err; } - if (ret) + if (ret) { audiod_cmdline_parser_config_file(config_file, &conf, ¶ms); + daemon_set_loglevel(conf.loglevel_arg); + } free(config_file); - daemon_set_loglevel(conf.loglevel_arg); return; err: free(config_file); @@ -1350,9 +1351,9 @@ int main(int argc, char *argv[]) }; valid_fd_012(); - if (audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms)) - exit(EXIT_FAILURE); + audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms); HANDLE_VERSION_FLAG("audiod", conf); + daemon_set_loglevel(conf.loglevel_arg); /* init receivers/filters/writers early to make help work */ recv_init(); filter_init();