diff options
author | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2017-02-25 12:46:12 +0200 |
---|---|---|
committer | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2017-02-25 12:46:12 +0200 |
commit | 0bda31e2154e0557d293fada5cbe5804dd702cdf (patch) | |
tree | 8a2fdd9eae0744882d6aadff1be549767ce85514 /src/main.c | |
parent | ecbc7654201d8ed79666d1d2d157f8f729d584e4 (diff) |
moved [stream] configuration to stream.conf
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index 7f590aca60..ae8f599aae 100644 --- a/src/main.c +++ b/src/main.c @@ -705,6 +705,8 @@ int main(int argc, char **argv) { if(!config_loaded) config_load(NULL, 0); + // ------------------------------------------------------------------------ + // initialize netdata { char *pmax = config_get(CONFIG_SECTION_GLOBAL, "glibc malloc arena max for plugins", "1"); if(pmax && *pmax) @@ -757,6 +759,16 @@ int main(int argc, char **argv) { log_init(); error_log_limit_unlimited(); + + // -------------------------------------------------------------------- + // load stream.conf + { + char filename[FILENAME_MAX + 1]; + snprintfz(filename, FILENAME_MAX, "%s/stream.conf", netdata_configured_config_dir); + appconfig_load(&stream_config, filename, 0); + } + + // -------------------------------------------------------------------- // setup process signals @@ -851,15 +863,6 @@ int main(int argc, char **argv) { if(web_server_mode != WEB_SERVER_MODE_NONE) create_listen_sockets(); - - - // -------------------------------------------------------------------- - // load the aggregated host configuration file - { - char filename[FILENAME_MAX + 1]; - snprintfz(filename, FILENAME_MAX, "%s/aggregated_hosts.conf", netdata_configured_config_dir); - appconfig_load(&stream_config, filename, 0); - } } // initialize the log files |