X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=a72585e28377a1157bcae85459bc73176b14d8d3;hb=fce6239dd648aa20070c96b43a49a04e97dff96f;hp=7f590aca605f970a90543a07a005b6d8cd3aeb0e;hpb=ecbc7654201d8ed79666d1d2d157f8f729d584e4;p=netdata.git diff --git a/src/main.c b/src/main.c index 7f590aca..a72585e2 100644 --- a/src/main.c +++ b/src/main.c @@ -60,7 +60,7 @@ struct netdata_static_thread static_threads[] = { }; void web_server_threading_selection(void) { - web_server_mode = web_server_mode_id(config_get(CONFIG_SECTION_API, "mode", web_server_mode_name(web_server_mode))); + web_server_mode = web_server_mode_id(config_get(CONFIG_SECTION_WEB, "mode", web_server_mode_name(web_server_mode))); int multi_threaded = (web_server_mode == WEB_SERVER_MODE_MULTI_THREADED); int single_threaded = (web_server_mode == WEB_SERVER_MODE_SINGLE_THREADED); @@ -74,16 +74,16 @@ void web_server_threading_selection(void) { static_threads[i].enabled = single_threaded; } - web_client_timeout = (int) config_get_number(CONFIG_SECTION_API, "disconnect idle clients after seconds", DEFAULT_DISCONNECT_IDLE_WEB_CLIENTS_AFTER_SECONDS); + web_client_timeout = (int) config_get_number(CONFIG_SECTION_WEB, "disconnect idle clients after seconds", DEFAULT_DISCONNECT_IDLE_WEB_CLIENTS_AFTER_SECONDS); - respect_web_browser_do_not_track_policy = config_get_boolean(CONFIG_SECTION_API, "respect do not track policy", respect_web_browser_do_not_track_policy); - web_x_frame_options = config_get(CONFIG_SECTION_API, "x-frame-options response header", ""); + respect_web_browser_do_not_track_policy = config_get_boolean(CONFIG_SECTION_WEB, "respect do not track policy", respect_web_browser_do_not_track_policy); + web_x_frame_options = config_get(CONFIG_SECTION_WEB, "x-frame-options response header", ""); if(!*web_x_frame_options) web_x_frame_options = NULL; #ifdef NETDATA_WITH_ZLIB - web_enable_gzip = config_get_boolean(CONFIG_SECTION_API, "enable gzip compression", web_enable_gzip); + web_enable_gzip = config_get_boolean(CONFIG_SECTION_WEB, "enable gzip compression", web_enable_gzip); - char *s = config_get(CONFIG_SECTION_API, "gzip compression strategy", "default"); + char *s = config_get(CONFIG_SECTION_WEB, "gzip compression strategy", "default"); if(!strcmp(s, "default")) web_gzip_strategy = Z_DEFAULT_STRATEGY; else if(!strcmp(s, "filtered")) @@ -99,7 +99,7 @@ void web_server_threading_selection(void) { web_gzip_strategy = Z_DEFAULT_STRATEGY; } - web_gzip_level = (int)config_get_number(CONFIG_SECTION_API, "gzip compression level", 3); + web_gzip_level = (int)config_get_number(CONFIG_SECTION_WEB, "gzip compression level", 3); if(web_gzip_level < 1) { error("Invalid compression level %d. Valid levels are 1 (fastest) to 9 (best ratio). Proceeding with level 1 (fastest compression).", web_gzip_level); web_gzip_level = 1; @@ -230,6 +230,7 @@ struct option_def options[] = { { 't', "The internal clock of netdata.", "seconds", "1"}, { 'u', "Run as user.", "username", "netdata"}, { 'v', "Print netdata version and exit.", NULL, NULL}, + { 'V', "Print netdata version and exit.", NULL, NULL}, { 'W', "See Advanced options below.", "options", NULL}, }; @@ -365,42 +366,45 @@ static void backwards_compatible_config() { web_server_mode = (mode)?WEB_SERVER_MODE_MULTI_THREADED:WEB_SERVER_MODE_SINGLE_THREADED; } - // move [global] options to the [api] section + // move [global] options to the [web] section + config_move(CONFIG_SECTION_GLOBAL, "http port listen backlog", + CONFIG_SECTION_WEB, "listen backlog"); + config_move(CONFIG_SECTION_GLOBAL, "bind socket to IP", - CONFIG_SECTION_API, "bind to"); + CONFIG_SECTION_WEB, "bind to"); config_move(CONFIG_SECTION_GLOBAL, "bind to", - CONFIG_SECTION_API, "bind to"); + CONFIG_SECTION_WEB, "bind to"); config_move(CONFIG_SECTION_GLOBAL, "port", - CONFIG_SECTION_API, "default port"); + CONFIG_SECTION_WEB, "default port"); config_move(CONFIG_SECTION_GLOBAL, "default port", - CONFIG_SECTION_API, "default port"); + CONFIG_SECTION_WEB, "default port"); - config_move(CONFIG_SECTION_GLOBAL, "disconnect idle clients after seconds", - CONFIG_SECTION_API, "disconnect idle clients after seconds"); + config_move(CONFIG_SECTION_GLOBAL, "disconnect idle web clients after seconds", + CONFIG_SECTION_WEB, "disconnect idle clients after seconds"); config_move(CONFIG_SECTION_GLOBAL, "respect web browser do not track policy", - CONFIG_SECTION_API, "respect do not track policy"); + CONFIG_SECTION_WEB, "respect do not track policy"); config_move(CONFIG_SECTION_GLOBAL, "web x-frame-options header", - CONFIG_SECTION_API, "x-frame-options response header"); + CONFIG_SECTION_WEB, "x-frame-options response header"); config_move(CONFIG_SECTION_GLOBAL, "enable web responses gzip compression", - CONFIG_SECTION_API, "enable gzip compression"); + CONFIG_SECTION_WEB, "enable gzip compression"); config_move(CONFIG_SECTION_GLOBAL, "web compression strategy", - CONFIG_SECTION_API, "gzip compression strategy"); + CONFIG_SECTION_WEB, "gzip compression strategy"); config_move(CONFIG_SECTION_GLOBAL, "web compression level", - CONFIG_SECTION_API, "gzip compression level"); + CONFIG_SECTION_WEB, "gzip compression level"); config_move(CONFIG_SECTION_GLOBAL, "web files owner", - CONFIG_SECTION_API, "web files owner"); + CONFIG_SECTION_WEB, "web files owner"); config_move(CONFIG_SECTION_GLOBAL, "web files group", - CONFIG_SECTION_API, "web files group"); + CONFIG_SECTION_WEB, "web files group"); } static void get_netdata_configured_variables() { @@ -411,7 +415,7 @@ static void get_netdata_configured_variables() { char buf[HOSTNAME_MAX + 1]; if(gethostname(buf, HOSTNAME_MAX) == -1) - error("WARNING: Cannot get machine hostname."); + error("Cannot get machine hostname."); netdata_configured_hostname = config_get(CONFIG_SECTION_GLOBAL, "hostname", buf); debug(D_OPTIONS, "hostname set to '%s'", netdata_configured_hostname); @@ -513,6 +517,9 @@ void set_global_environment() { // disable buffering for python plugins setenv("PYTHONUNBUFFERED", "1", 1); + + // switch to standard locale for plugins + setenv("LC_ALL", "C", 1); } int main(int argc, char **argv) { @@ -592,7 +599,7 @@ int main(int argc, char **argv) { help(0); break; case 'i': - config_set(CONFIG_SECTION_API, "bind to", optarg); + config_set(CONFIG_SECTION_WEB, "bind to", optarg); break; case 'P': strncpy(pidfile, optarg, FILENAME_MAX); @@ -611,6 +618,7 @@ int main(int argc, char **argv) { config_set(CONFIG_SECTION_GLOBAL, "run as user", optarg); break; case 'v': + case 'V': printf("%s %s\n", program_name, program_version); return 0; case 'W': @@ -705,6 +713,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 +767,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 @@ -839,7 +859,13 @@ int main(int argc, char **argv) { // get the user we should run // IMPORTANT: this is required before web_files_uid() - user = config_get(CONFIG_SECTION_GLOBAL, "run as user" , (getuid() == 0)?NETDATA_USER:""); + if(getuid() == 0) { + user = config_get(CONFIG_SECTION_GLOBAL, "run as user", NETDATA_USER); + } + else { + struct passwd *passwd = getpwuid(getuid()); + user = config_get(CONFIG_SECTION_GLOBAL, "run as user", (passwd && passwd->pw_name)?passwd->pw_name:""); + } // IMPORTANT: these have to run once, while single threaded web_files_uid(); // IMPORTANT: web_files_uid() before web_files_gid() @@ -851,15 +877,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