summaryrefslogtreecommitdiffstats
path: root/daemon/main.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-11-07 12:19:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-11-07 12:20:17 +0000
commita64a253794ac64cb40befee54db53bde17dd0d49 (patch)
treec1024acc5f6e508814b944d99f112259bb28b1be /daemon/main.c
parentNew upstream version 1.10.0+dfsg (diff)
downloadnetdata-a64a253794ac64cb40befee54db53bde17dd0d49.tar.xz
netdata-a64a253794ac64cb40befee54db53bde17dd0d49.zip
New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--daemon/main.c (renamed from src/main.c)187
1 files changed, 107 insertions, 80 deletions
diff --git a/src/main.c b/daemon/main.c
index 798c7f0fc..b2c4c80bf 100644
--- a/src/main.c
+++ b/daemon/main.c
@@ -1,6 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#include "common.h"
-extern void *cgroups_main(void *ptr);
+struct config netdata_config = {
+ .sections = NULL,
+ .mutex = NETDATA_MUTEX_INITIALIZER,
+ .index = {
+ .avl_tree = {
+ .root = NULL,
+ .compar = appconfig_section_compare
+ },
+ .rwlock = AVL_LOCK_INITIALIZER
+ }
+};
void netdata_cleanup_and_exit(int ret) {
// enabling this, is wrong
@@ -39,43 +51,31 @@ void netdata_cleanup_and_exit(int ret) {
struct netdata_static_thread static_threads[] = {
-#ifdef INTERNAL_PLUGIN_NFACCT
- // nfacct requires root access
- // so, we build it as an external plugin with setuid to root
- {"PLUGIN[nfacct]", CONFIG_SECTION_PLUGINS, "nfacct", 1, NULL, NULL, nfacct_main},
-#endif
-
-#ifdef NETDATA_INTERNAL_CHECKS
- // debugging plugin
- {"PLUGIN[check]", CONFIG_SECTION_PLUGINS, "checks", 0, NULL, NULL, checks_main},
-#endif
+ NETDATA_PLUGIN_HOOK_CHECKS
+ NETDATA_PLUGIN_HOOK_FREEBSD
+ NETDATA_PLUGIN_HOOK_MACOS
-#if defined(__FreeBSD__)
- // FreeBSD internal plugins
- {"PLUGIN[freebsd]", CONFIG_SECTION_PLUGINS, "freebsd", 1, NULL, NULL, freebsd_main},
-#elif defined(__APPLE__)
- // macOS internal plugins
- {"PLUGIN[macos]", CONFIG_SECTION_PLUGINS, "macos", 1, NULL, NULL, macos_main},
-#else
// linux internal plugins
- {"PLUGIN[proc]", CONFIG_SECTION_PLUGINS, "proc", 1, NULL, NULL, proc_main},
- {"PLUGIN[diskspace]", CONFIG_SECTION_PLUGINS, "diskspace", 1, NULL, NULL, proc_diskspace_main},
- {"PLUGIN[cgroup]", CONFIG_SECTION_PLUGINS, "cgroups", 1, NULL, NULL, cgroups_main},
- {"PLUGIN[tc]", CONFIG_SECTION_PLUGINS, "tc", 1, NULL, NULL, tc_main},
-#endif /* __FreeBSD__, __APPLE__*/
-
- // common plugins for all systems
- {"PLUGIN[idlejitter]", CONFIG_SECTION_PLUGINS, "idlejitter", 1, NULL, NULL, cpuidlejitter_main},
- {"BACKENDS", NULL, NULL, 1, NULL, NULL, backends_main},
- {"HEALTH", NULL, NULL, 1, NULL, NULL, health_main},
- {"PLUGINSD", NULL, NULL, 1, NULL, NULL, pluginsd_main},
- {"WEB_SERVER[multi]", NULL, NULL, 1, NULL, NULL, socket_listen_main_multi_threaded},
- {"WEB_SERVER[single]", NULL, NULL, 0, NULL, NULL, socket_listen_main_single_threaded},
- {"WEB_SERVER[static1]", NULL, NULL, 0, NULL, NULL, socket_listen_main_static_threaded},
- {"STREAM", NULL, NULL, 0, NULL, NULL, rrdpush_sender_thread},
- {"STATSD", NULL, NULL, 1, NULL, NULL, statsd_main},
-
- {NULL, NULL, NULL, 0, NULL, NULL, NULL}
+ NETDATA_PLUGIN_HOOK_LINUX_NFACCT
+ NETDATA_PLUGIN_HOOK_LINUX_PROC
+ NETDATA_PLUGIN_HOOK_LINUX_DISKSPACE
+ NETDATA_PLUGIN_HOOK_LINUX_CGROUPS
+ NETDATA_PLUGIN_HOOK_LINUX_TC
+
+ NETDATA_PLUGIN_HOOK_IDLEJITTER
+ NETDATA_PLUGIN_HOOK_STATSD
+
+ // common plugins for all systems
+ {"BACKENDS", NULL, NULL, 1, NULL, NULL, backends_main},
+ {"WEB_SERVER[multi]", NULL, NULL, 1, NULL, NULL, socket_listen_main_multi_threaded},
+ {"WEB_SERVER[single]", NULL, NULL, 0, NULL, NULL, socket_listen_main_single_threaded},
+ {"WEB_SERVER[static1]", NULL, NULL, 0, NULL, NULL, socket_listen_main_static_threaded},
+ {"STREAM", NULL, NULL, 0, NULL, NULL, rrdpush_sender_thread},
+
+ NETDATA_PLUGIN_HOOK_PLUGINSD
+ NETDATA_PLUGIN_HOOK_HEALTH
+
+ {NULL, NULL, NULL, 0, NULL, NULL, NULL}
};
void web_server_threading_selection(void) {
@@ -101,6 +101,7 @@ void web_server_threading_selection(void) {
void web_server_config_options(void) {
web_client_timeout = (int) config_get_number(CONFIG_SECTION_WEB, "disconnect idle clients after seconds", web_client_timeout);
web_client_first_request_timeout = (int) config_get_number(CONFIG_SECTION_WEB, "timeout for first request", web_client_first_request_timeout);
+ web_client_streaming_rate_t = config_get_number(CONFIG_SECTION_WEB, "accept a streaming request every seconds", web_client_streaming_rate_t);
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", "");
@@ -145,7 +146,7 @@ void web_server_config_options(void) {
}
-int killpid(pid_t pid, int sig)
+int killpid(pid_t pid, int signal)
{
int ret = -1;
debug(D_EXIT, "Request to kill pid %d", pid);
@@ -168,7 +169,7 @@ int killpid(pid_t pid, int sig)
}
else {
errno = 0;
- ret = kill(pid, sig);
+ ret = kill(pid, signal);
if(ret == -1) {
switch(errno) {
case ESRCH:
@@ -192,7 +193,8 @@ int killpid(pid_t pid, int sig)
void cancel_main_threads() {
error_log_limit_unlimited();
- int i, found = 0, max = 5 * USEC_PER_SEC, step = 100000;
+ int i, found = 0;
+ usec_t max = 5 * USEC_PER_SEC, step = 100000;
for (i = 0; static_threads[i].name != NULL ; i++) {
if(static_threads[i].enabled == NETDATA_MAIN_THREAD_RUNNING) {
info("EXIT: Stopping master thread: %s", static_threads[i].name);
@@ -226,6 +228,7 @@ struct option_def option_definitions[] = {
// opt description arg name default value
{ 'c', "Configuration file to load.", "filename", CONFIG_DIR "/" CONFIG_FILENAME},
{ 'D', "Do not fork. Run in the foreground.", NULL, "run in the background"},
+ { 'd', "Fork. Run in the background.", NULL, "run in the background"},
{ 'h', "Display this help message.", NULL, NULL},
{ 'P', "File to save a pid while running.", "filename", "do not save pid to a file"},
{ 'i', "The IP address to listen to.", "IP", "all IP addresses IPv4 and IPv6"},
@@ -271,16 +274,14 @@ int help(int exitcode) {
" All rights reserved.\n"
"\n"
" Home Page : https://my-netdata.io\n"
- " Source Code: https://github.com/firehol/netdata\n"
- " Wiki / Docs: https://github.com/firehol/netdata/wiki\n"
- " Support : https://github.com/firehol/netdata/issues\n"
- " License : https://github.com/firehol/netdata/blob/master/LICENSE.md\n"
+ " Source Code: https://github.com/netdata/netdata\n"
+ " Wiki / Docs: https://github.com/netdata/netdata/wiki\n"
+ " Support : https://github.com/netdata/netdata/issues\n"
+ " License : https://github.com/netdata/netdata/blob/master/LICENSE.md\n"
"\n"
" Twitter : https://twitter.com/linuxnetdata\n"
" Facebook : https://www.facebook.com/linuxnetdata/\n"
"\n"
- " netdata is a https://firehol.org project.\n"
- "\n"
"\n"
);
@@ -322,7 +323,8 @@ int help(int exitcode) {
// TODO: Remove this function with the nix major release.
void remove_option(int opt_index, int *argc, char **argv) {
- int i = opt_index;
+ int i;
+
// remove the options.
do {
*argc = *argc - 1;
@@ -356,9 +358,9 @@ void log_init(void) {
snprintfz(filename, FILENAME_MAX, "%s/access.log", netdata_configured_log_dir);
stdaccess_filename = config_get(CONFIG_SECTION_GLOBAL, "access log", filename);
- error_log_throttle_period_backup =
error_log_throttle_period = config_get_number(CONFIG_SECTION_GLOBAL, "errors flood protection period", error_log_throttle_period);
error_log_errors_per_period = (unsigned long)config_get_number(CONFIG_SECTION_GLOBAL, "errors to trigger flood protection", (long long int)error_log_errors_per_period);
+ error_log_errors_per_period_backup = error_log_errors_per_period;
setenv("NETDATA_ERRORS_THROTTLE_PERIOD", config_get(CONFIG_SECTION_GLOBAL, "errors flood protection period" , ""), 1);
setenv("NETDATA_ERRORS_PER_PERIOD", config_get(CONFIG_SECTION_GLOBAL, "errors to trigger flood protection", ""), 1);
@@ -457,12 +459,13 @@ static void get_netdata_configured_variables() {
// ------------------------------------------------------------------------
// get system paths
- netdata_configured_config_dir = config_get(CONFIG_SECTION_GLOBAL, "config directory", CONFIG_DIR);
- netdata_configured_log_dir = config_get(CONFIG_SECTION_GLOBAL, "log directory", LOG_DIR);
- netdata_configured_web_dir = config_get(CONFIG_SECTION_GLOBAL, "web files directory", WEB_DIR);
- netdata_configured_cache_dir = config_get(CONFIG_SECTION_GLOBAL, "cache directory", CACHE_DIR);
- netdata_configured_varlib_dir = config_get(CONFIG_SECTION_GLOBAL, "lib directory", VARLIB_DIR);
- netdata_configured_home_dir = config_get(CONFIG_SECTION_GLOBAL, "home directory", CACHE_DIR);
+ netdata_configured_user_config_dir = config_get(CONFIG_SECTION_GLOBAL, "config directory", netdata_configured_user_config_dir);
+ netdata_configured_stock_config_dir = config_get(CONFIG_SECTION_GLOBAL, "stock config directory", netdata_configured_stock_config_dir);
+ netdata_configured_log_dir = config_get(CONFIG_SECTION_GLOBAL, "log directory", netdata_configured_log_dir);
+ netdata_configured_web_dir = config_get(CONFIG_SECTION_GLOBAL, "web files directory", netdata_configured_web_dir);
+ netdata_configured_cache_dir = config_get(CONFIG_SECTION_GLOBAL, "cache directory", netdata_configured_cache_dir);
+ netdata_configured_varlib_dir = config_get(CONFIG_SECTION_GLOBAL, "lib directory", netdata_configured_varlib_dir);
+ netdata_configured_home_dir = config_get(CONFIG_SECTION_GLOBAL, "home directory", netdata_configured_home_dir);
{
char plugins_dirs[(FILENAME_MAX * 2) + 1];
@@ -480,6 +483,7 @@ static void get_netdata_configured_variables() {
// ------------------------------------------------------------------------
netdata_configured_host_prefix = config_get(CONFIG_SECTION_GLOBAL, "host access prefix", "");
+ verify_netdata_host_prefix();
// --------------------------------------------------------------------
// get KSM settings
@@ -592,15 +596,17 @@ void set_global_environment() {
setenv("NETDATA_UPDATE_EVERY", b, 1);
}
- setenv("NETDATA_HOSTNAME" , netdata_configured_hostname, 1);
- setenv("NETDATA_CONFIG_DIR" , verify_required_directory(netdata_configured_config_dir), 1);
- setenv("NETDATA_PLUGINS_DIR", verify_required_directory(netdata_configured_plugins_dir), 1);
- setenv("NETDATA_WEB_DIR" , verify_required_directory(netdata_configured_web_dir), 1);
- setenv("NETDATA_CACHE_DIR" , verify_required_directory(netdata_configured_cache_dir), 1);
- setenv("NETDATA_LIB_DIR" , verify_required_directory(netdata_configured_varlib_dir), 1);
- setenv("NETDATA_LOG_DIR" , verify_required_directory(netdata_configured_log_dir), 1);
- setenv("HOME" , verify_required_directory(netdata_configured_home_dir), 1);
- setenv("NETDATA_HOST_PREFIX", netdata_configured_host_prefix, 1);
+ setenv("NETDATA_HOSTNAME" , netdata_configured_hostname, 1);
+ setenv("NETDATA_CONFIG_DIR" , verify_required_directory(netdata_configured_user_config_dir), 1);
+ setenv("NETDATA_USER_CONFIG_DIR" , verify_required_directory(netdata_configured_user_config_dir), 1);
+ setenv("NETDATA_STOCK_CONFIG_DIR" , verify_required_directory(netdata_configured_stock_config_dir), 1);
+ setenv("NETDATA_PLUGINS_DIR" , verify_required_directory(netdata_configured_plugins_dir), 1);
+ setenv("NETDATA_WEB_DIR" , verify_required_directory(netdata_configured_web_dir), 1);
+ setenv("NETDATA_CACHE_DIR" , verify_required_directory(netdata_configured_cache_dir), 1);
+ setenv("NETDATA_LIB_DIR" , verify_required_directory(netdata_configured_varlib_dir), 1);
+ setenv("NETDATA_LOG_DIR" , verify_required_directory(netdata_configured_log_dir), 1);
+ setenv("HOME" , verify_required_directory(netdata_configured_home_dir), 1);
+ setenv("NETDATA_HOST_PREFIX" , netdata_configured_host_prefix, 1);
get_system_timezone();
@@ -622,6 +628,36 @@ void set_global_environment() {
setenv("LC_ALL", "C", 1);
}
+static int load_netdata_conf(char *filename, char overwrite_used) {
+ errno = 0;
+
+ int ret = 0;
+
+ if(filename && *filename) {
+ ret = config_load(filename, overwrite_used);
+ if(!ret)
+ error("CONFIG: cannot load config file '%s'.", filename);
+ }
+ else {
+ filename = strdupz_path_subpath(netdata_configured_user_config_dir, "netdata.conf");
+
+ ret = config_load(filename, overwrite_used);
+ if(!ret) {
+ info("CONFIG: cannot load user config '%s'. Will try the stock version.", filename);
+ freez(filename);
+
+ filename = strdupz_path_subpath(netdata_configured_stock_config_dir, "netdata.conf");
+ ret = config_load(filename, overwrite_used);
+ if(!ret)
+ info("CONFIG: cannot load stock config '%s'. Running with internal defaults.", filename);
+ }
+
+ freez(filename);
+ }
+
+ return ret;
+}
+
int main(int argc, char **argv) {
int i;
int config_loaded = 0;
@@ -682,7 +718,7 @@ int main(int argc, char **argv) {
while( (opt = getopt(argc, argv, optstring)) != -1 ) {
switch(opt) {
case 'c':
- if(config_load(optarg, 1) != 1) {
+ if(load_netdata_conf(optarg, 1) != 1) {
error("Cannot load configuration file %s.", optarg);
return 1;
}
@@ -694,6 +730,9 @@ int main(int argc, char **argv) {
case 'D':
dont_fork = 1;
break;
+ case 'd':
+ dont_fork = 0;
+ break;
case 'h':
return help(0);
case 'i':
@@ -727,9 +766,6 @@ int main(int argc, char **argv) {
if(strcmp(optarg, "unittest") == 0) {
if(unit_test_buffer()) return 1;
if(unit_test_str2ld()) return 1;
- //default_rrd_update_every = 1;
- //default_rrd_memory_mode = RRD_MEMORY_MODE_RAM;
- //if(!config_loaded) config_load(NULL, 0);
get_netdata_configured_variables();
default_rrd_update_every = 1;
default_rrd_memory_mode = RRD_MEMORY_MODE_RAM;
@@ -837,7 +873,7 @@ int main(int argc, char **argv) {
if(!config_loaded) {
fprintf(stderr, "warning: no configuration file has been loaded. Use -c CONFIG_FILE, before -W get. Using default config.\n");
- config_load(NULL, 0);
+ load_netdata_conf(NULL, 0);
}
backwards_compatible_config();
@@ -875,7 +911,7 @@ int main(int argc, char **argv) {
#endif
if(!config_loaded)
- config_load(NULL, 0);
+ load_netdata_conf(NULL, 0);
// ------------------------------------------------------------------------
// initialize netdata
@@ -898,8 +934,8 @@ int main(int argc, char **argv) {
// work while we are cd into config_dir
// to allow the plugins refer to their config
// files using relative filenames
- if(chdir(netdata_configured_config_dir) == -1)
- fatal("Cannot cd to '%s'", netdata_configured_config_dir);
+ if(chdir(netdata_configured_user_config_dir) == -1)
+ fatal("Cannot cd to '%s'", netdata_configured_user_config_dir);
}
char *user = NULL;
@@ -933,15 +969,6 @@ int main(int argc, char **argv) {
// --------------------------------------------------------------------
- // 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
// block signals while initializing threads.
@@ -1009,7 +1036,7 @@ int main(int argc, char **argv) {
if(getrlimit(RLIMIT_NOFILE, &rlimit_nofile) != 0)
error("getrlimit(RLIMIT_NOFILE) failed");
else
- info("resources control: allowed file descriptors: soft = %zu, max = %zu", rlimit_nofile.rlim_cur, rlimit_nofile.rlim_max);
+ info("resources control: allowed file descriptors: soft = %zu, max = %zu", (size_t)rlimit_nofile.rlim_cur, (size_t)rlimit_nofile.rlim_max);
// fork, switch user, create pid file, set process priority
if(become_daemon(dont_fork, user) == -1)