emgauwa/core-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve config behaviour

Browse source
This commit is contained in:
Tobias Reisinger 2020-11-19 00:59:26 +01:00
parent 5796f88e05
commit 0c13c03a73
11 changed files with 2571 additions and 37 deletions

7
src/main.c
View file

@ -59,9 +59,10 @@ main(int argc, const char** argv)
config_init();
cli_parse(argc, argv, global_config);
cli_t cli;
cli_parse(argc, argv, &cli);
config_load(global_config);
config_load(global_config, cli.config_file);
if(global_config->logging.file == NULL)
{
@ -73,8 +74,6 @@ main(int argc, const char** argv)
config_load_directory(global_config, global_config->include);
}
LOGGER_DEBUG("Loaded config from %s\n", global_config->file);
/******************** SETUP CONNECTION ********************/