]> arthur.barton.de Git - netdata.git/blobdiff - src/main.c
added configuration options for controlling web compression level and strategy and...
[netdata.git] / src / main.c
index 4005516f85a84b81ed2ae7f0bf6d94571953f091..f11460b5518a587e897afce2621271f75254e4aa 100644 (file)
@@ -1,43 +1,44 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <errno.h>
+#include <getopt.h>
+#include <pthread.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <syslog.h>
-#include <pthread.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
+#include <sys/wait.h>
+#include <syslog.h>
+#include <unistd.h>
 
+#include "appconfig.h"
 #include "common.h"
-#include "log.h"
 #include "daemon.h"
-#include "web_server.h"
+#include "log.h"
 #include "popen.h"
-#include "appconfig.h"
-#include "web_client.h"
 #include "rrd.h"
 #include "rrd2json.h"
+#include "web_client.h"
+#include "web_server.h"
 
 #include "unit_test.h"
 
-#include "plugins_d.h"
-#include "plugin_idlejitter.h"
-#include "plugin_tc.h"
 #include "plugin_checks.h"
-#include "plugin_proc.h"
+#include "plugin_idlejitter.h"
 #include "plugin_nfacct.h"
+#include "registry.h"
+#include "plugin_proc.h"
+#include "plugin_tc.h"
+#include "plugins_d.h"
 
 #include "main.h"
 
-int netdata_exit = 0;
+extern void *cgroups_main(void *ptr);
+
+volatile sig_atomic_t netdata_exit = 0;
 
 void netdata_cleanup_and_exit(int ret)
 {
@@ -45,13 +46,8 @@ void netdata_cleanup_and_exit(int ret)
        rrdset_save_all();
        // kill_childs();
 
-       if(pidfd != -1) {
-               if(ftruncate(pidfd, 0) != 0)
-                       error("Cannot truncate pidfile '%s'.", pidfile);
-
-               close(pidfd);
-               pidfd = -1;
-       }
+       // let it log a few more error messages
+       error_log_limit_reset();
 
        if(pidfile[0]) {
                if(unlink(pidfile) != 0)
@@ -74,25 +70,70 @@ struct netdata_static_thread {
 
        void (*init_routine) (void);
        void *(*start_routine) (void *);
-};
-
-struct netdata_static_thread static_threads[] = {
-       {"tc",                  "plugins",      "tc",                   1, NULL, NULL,  tc_main},
-       {"idlejitter",  "plugins",      "idlejitter",   1, NULL, NULL,  cpuidlejitter_main},
-       {"proc",                "plugins",      "proc",                 1, NULL, NULL,  proc_main},
-
+} static_threads[] = {
 #ifdef INTERNAL_PLUGIN_NFACCT
-       // nfacct requires root access
+// nfacct requires root access
        // so, we build it as an external plugin with setuid to root
-       {"nfacct",              "plugins",      "nfacct",               1, NULL, NULL,  nfacct_main},
+       {"nfacct",              "plugins",  "nfacct",     1, NULL, NULL, nfacct_main},
 #endif
 
-       {"plugins.d",   NULL,           NULL,                   1, NULL, NULL,  pluginsd_main},
-       {"check",               "plugins",      "checks",               0, NULL, NULL,  checks_main},
-       {"web",                 NULL,           NULL,                   1, NULL, NULL,  socket_listen_main},
-       {NULL,                  NULL,           NULL,                   0, NULL, NULL,  NULL}
+       {"tc",                 "plugins",   "tc",         1, NULL, NULL, tc_main},
+       {"idlejitter",         "plugins",   "idlejitter", 1, NULL, NULL, cpuidlejitter_main},
+       {"proc",               "plugins",   "proc",       1, NULL, NULL, proc_main},
+       {"cgroups",            "plugins",   "cgroups",    1, NULL, NULL, cgroups_main},
+       {"plugins.d",           NULL,       NULL,         1, NULL, NULL, pluginsd_main},
+       {"check",               "plugins",  "checks",     0, NULL, NULL, checks_main},
+       {"web",                 NULL,       NULL,         1, NULL, NULL, socket_listen_main_multi_threaded},
+       {"web-single-threaded", NULL,       NULL,         0, NULL, NULL, socket_listen_main_single_threaded},
+       {NULL,                  NULL,       NULL,         0, NULL, NULL, NULL}
 };
 
+void web_server_threading_selection(void) {
+       int threaded = config_get_boolean("global", "multi threaded web server", 1);
+
+       int i;
+       for(i = 0; static_threads[i].name ; i++) {
+               if(static_threads[i].start_routine == socket_listen_main_multi_threaded)
+                       static_threads[i].enabled = threaded?1:0;
+
+               if(static_threads[i].start_routine == socket_listen_main_single_threaded)
+                       static_threads[i].enabled = threaded?0:1;
+       }
+
+       web_client_timeout = (int) config_get_number("global", "disconnect idle web clients after seconds", DEFAULT_DISCONNECT_IDLE_WEB_CLIENTS_AFTER_SECONDS);
+
+#ifdef NETDATA_WITH_ZLIB
+       web_enable_gzip = config_get_boolean("global", "enable web responses gzip compression", web_enable_gzip);
+
+       char *s = config_get("global", "web compression strategy", "default");
+       if(!strcmp(s, "default"))
+               web_gzip_strategy = Z_DEFAULT_STRATEGY;
+       else if(!strcmp(s, "filtered"))
+               web_gzip_strategy = Z_FILTERED;
+       else if(!strcmp(s, "huffman only"))
+               web_gzip_strategy = Z_HUFFMAN_ONLY;
+       else if(!strcmp(s, "rle"))
+               web_gzip_strategy = Z_RLE;
+       else if(!strcmp(s, "fixed"))
+               web_gzip_strategy = Z_FIXED;
+       else {
+               error("Invalid compression strategy '%s'. Valid strategies are 'default', 'filtered', 'huffman only', 'rle' and 'fixed'. Proceeding with 'default'.");
+               web_gzip_strategy = Z_DEFAULT_STRATEGY;
+       }
+
+       web_gzip_level = (int)config_get_number("global", "web 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 = 1;
+       }
+       else if(web_gzip_level > 9) {
+               error("Invalid compression level %d. Valid levels are 1 (fastest) to 9 (best ratio). Proceeding with level 9 (best compression).");
+               web_gzip_level = 9;
+       }
+#endif /* NETDATA_WITH_ZLIB */
+}
+
+
 int killpid(pid_t pid, int sig)
 {
        int ret = -1;
@@ -116,19 +157,7 @@ int killpid(pid_t pid, int sig)
        }
        else {
                errno = 0;
-
-               void (*old)(int);
-               old = signal(sig, SIG_IGN);
-               if(old == SIG_ERR) {
-                       error("Cannot overwrite signal handler for signal %d", sig);
-                       old = sig_handler;
-               }
-
                ret = kill(pid, sig);
-
-               if(signal(sig, old) == SIG_ERR)
-                       error("Cannot restore signal handler for signal %d", sig);
-
                if(ret == -1) {
                        switch(errno) {
                                case ESRCH:
@@ -197,6 +226,72 @@ void kill_childs()
        debug(D_EXIT, "All threads/childs stopped.");
 }
 
+struct option_def options[] = {
+       // opt description                                                       arg name                     default value
+       {'c', "Load alternate configuration file",                               "config_file",                          CONFIG_DIR "/" CONFIG_FILENAME},
+       {'D', "Disable fork into background",                                    NULL,                                   NULL},
+       {'h', "Display help message",                                            NULL,                                   NULL},
+       {'P', "File to save a pid while running",                                "FILE",                                 NULL},
+       {'i', "The IP address to listen to.",                                    "address",                              "All addresses"},
+       {'p', "Port to listen. Can be from 1 to 65535.",                         "port_number",                          "19999"},
+       {'s', "Path to access host /proc and /sys when running in a container.", "PATH",                                 NULL},
+       {'t', "The frequency in seconds, for data collection. \
+Same as 'update every' config file option.",                                 "seconds",                              "1"},
+       {'u', "System username to run as.",                                      "username",                             "netdata"},
+       {'v', "Version of the program",                                          NULL,                                   NULL},
+       {'W', "vendor options.",                                                 "stacksize=<size>|unittest|debug_flag", NULL},
+};
+
+void help(int exitcode) {
+       FILE *stream;
+       if(exitcode == 0)
+               stream = stdout;
+       else
+               stream = stderr;
+
+       int num_opts = sizeof(options) / sizeof(struct option_def);
+       int i;
+       int max_len_arg = 0;
+
+       // Compute maximum argument length
+       for( i = 0; i < num_opts; i++ ) {
+               if(options[i].arg_name) {
+                       int len_arg = strlen(options[i].arg_name);
+                       if(len_arg > max_len_arg) max_len_arg = len_arg;
+               }
+       }
+
+       fprintf(stream, "SYNOPSIS: netdata [options]\n");
+       fprintf(stream, "\n");
+       fprintf(stream, "Options:\n");
+
+       // Output options description.
+       for( i = 0; i < num_opts; i++ ) {
+               fprintf(stream, "  -%c %-*s  %s", options[i].val, max_len_arg, options[i].arg_name ? options[i].arg_name : "", options[i].description);
+               if(options[i].default_value) {
+                       fprintf(stream, " Default: %s\n", options[i].default_value);
+               } else {
+                       fprintf(stream, "\n");
+               }
+       }
+
+       fflush(stream);
+       exit(exitcode);
+}
+
+// TODO: Remove this function with the nix major release.
+void remove_option(int opt_index, int *argc, char **argv) {
+       int i = opt_index;
+       // remove the options.
+       do {
+               *argc = *argc - 1;
+               for(i = opt_index; i < *argc; i++) {
+                       argv[i] = argv[i+1];
+               }
+               i = opt_index;
+       } while(argv[i][0] != '-' && opt_index >= *argc);
+}
+
 
 int main(int argc, char **argv)
 {
@@ -212,54 +307,120 @@ int main(int argc, char **argv)
        // set the name for logging
        program_name = "netdata";
 
-       // parse  the arguments
-       for(i = 1; i < argc ; i++) {
-               if(strcmp(argv[i], "-c") == 0 && (i+1) < argc) {
-                       if(load_config(argv[i+1], 1) != 1) {
-                               error("Cannot load configuration file %s.", argv[i+1]);
-                               exit(1);
+       // parse command line.
+
+       // parse depercated options
+       // TODO: Remove this block with the next major release.
+       {
+               i = 1;
+               while(i < argc) {
+                       if(strcmp(argv[i], "-pidfile") == 0 && (i+1) < argc) {
+                               strncpyz(pidfile, argv[i+1], FILENAME_MAX);
+                               fprintf(stderr, "%s: deprecate option -- %s -- please use -P instead.\n", argv[0], argv[i]);
+                               remove_option(i, &argc, argv);
                        }
-                       else {
-                               debug(D_OPTIONS, "Configuration loaded from %s.", argv[i+1]);
-                               config_loaded = 1;
+                       else if(strcmp(argv[i], "-nodaemon") == 0 || strcmp(argv[i], "-nd") == 0) {
+                               dont_fork = 1;
+                               fprintf(stderr, "%s: deprecate option -- %s -- please use -D instead.\n ", argv[0], argv[i]);
+                               remove_option(i, &argc, argv);
                        }
-                       i++;
-               }
-               else if(strcmp(argv[i], "-df") == 0 && (i+1) < argc) { config_set("global", "debug flags",  argv[i+1]); debug_flags = strtoull(argv[i+1], NULL, 0); i++; }
-               else if(strcmp(argv[i], "-p")  == 0 && (i+1) < argc) { config_set("global", "port",         argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-u")  == 0 && (i+1) < argc) { config_set("global", "run as user",  argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-l")  == 0 && (i+1) < argc) { config_set("global", "history",      argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-t")  == 0 && (i+1) < argc) { config_set("global", "update every", argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-ch") == 0 && (i+1) < argc) { config_set("global", "host access prefix", argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-stacksize") == 0 && (i+1) < argc) { config_set("global", "pthread stack size", argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-nodaemon") == 0 || strcmp(argv[i], "-nd") == 0) dont_fork = 1;
-               else if(strcmp(argv[i], "-pidfile") == 0 && (i+1) < argc) {
-                       i++;
-                       strncpy(pidfile, argv[i], FILENAME_MAX);
-                       pidfile[FILENAME_MAX] = '\0';
-               }
-               else if(strcmp(argv[i], "--unittest")  == 0) {
-                       rrd_update_every = 1;
-                       if(run_all_mockup_tests()) exit(1);
-                       if(unit_test_storage()) exit(1);
-                       fprintf(stderr, "\n\nALL TESTS PASSED\n\n");
-                       exit(0);
+                       else if(strcmp(argv[i], "-ch") == 0 && (i+1) < argc) {
+                               config_set("global", "host access prefix", argv[i+1]);
+                               fprintf(stderr, "%s: deprecate option -- %s -- please use -s instead.\n", argv[0], argv[i]);
+                               remove_option(i, &argc, argv);
+                       }
+                       else if(strcmp(argv[i], "-l") == 0 && (i+1) < argc) {
+                               config_set("global", "history", argv[i+1]);
+                               fprintf(stderr, "%s: deprecate option -- %s -- This option will be rmoved with V2.*.\n", argv[0], argv[i]);
+                               remove_option(i, &argc, argv);
+                       }
+                       else i++;
                }
-               else {
-                       fprintf(stderr, "Cannot understand option '%s'.\n", argv[i]);
-                       fprintf(stderr, "\nUSAGE: %s [-d] [-l LINES_TO_SAVE] [-u UPDATE_TIMER] [-p LISTEN_PORT] [-df debug flags].\n\n", argv[0]);
-                       fprintf(stderr, "  -c CONFIG FILE the configuration file to load. Default: %s.\n", CONFIG_DIR "/" CONFIG_FILENAME);
-                       fprintf(stderr, "  -l LINES_TO_SAVE can be from 5 to %d lines in JSON data. Default: %d.\n", RRD_HISTORY_ENTRIES_MAX, RRD_DEFAULT_HISTORY_ENTRIES);
-                       fprintf(stderr, "  -t UPDATE_TIMER can be from 1 to %d seconds. Default: %d.\n", UPDATE_EVERY_MAX, UPDATE_EVERY);
-                       fprintf(stderr, "  -p LISTEN_PORT can be from 1 to %d. Default: %d.\n", 65535, LISTEN_PORT);
-                       fprintf(stderr, "  -u USERNAME can be any system username to run as. Default: none.\n");
-                       fprintf(stderr, "  -ch path to access host /proc and /sys when running in a container. Default: empty.\n");
-                       fprintf(stderr, "  -nd or -nodeamon to disable forking in the background. Default: unset.\n");
-                       fprintf(stderr, "  -df FLAGS debug options. Default: 0x%08llx.\n", debug_flags);
-                       fprintf(stderr, "  -stacksize BYTES to overwrite the pthread stack size.\n");
-                       fprintf(stderr, "  -pidfile FILENAME to save a pid while running.\n");
-                       exit(1);
+       }
+
+       // parse options
+       {
+               int num_opts = sizeof(options) / sizeof(struct option_def);
+               char optstring[(num_opts * 2) + 1];
+
+               int string_i = 0;
+               for( i = 0; i < num_opts; i++ ) {
+                       optstring[string_i] = options[i].val;
+                       string_i++;
+                       if(options[i].arg_name) {
+                               optstring[string_i] = ':';
+                               string_i++;
+                       }
                }
+
+               int opt;
+               while( (opt = getopt(argc, argv, optstring)) != -1 ) {
+                       switch(opt) {
+                               case 'c':
+                                       if(load_config(optarg, 1) != 1) {
+                                               error("Cannot load configuration file %s.", optarg);
+                                               exit(1);
+                                       }
+                                       else {
+                                               debug(D_OPTIONS, "Configuration loaded from %s.", optarg);
+                                               config_loaded = 1;
+                                       }
+                                       break;
+                               case 'D':
+                                       dont_fork = 1;
+                                       break;
+                               case 'h':
+                                       help(0);
+                                       break;
+                               case 'i':
+                                       config_set("global", "bind socket to IP", optarg);
+                                       break;
+                               case 'P':
+                                       strncpy(pidfile, optarg, FILENAME_MAX);
+                                       pidfile[FILENAME_MAX] = '\0';
+                                       break;
+                               case 'p':
+                                       config_set("global", "port", optarg);
+                                       break;
+                               case 's':
+                                       config_set("global", "host access prefix", optarg);
+                                       break;
+                               case 't':
+                                       config_set("global", "update every", optarg);
+                                       break;
+                               case 'u':
+                                       config_set("global", "run as user", optarg);
+                                       break;
+                               case 'v':
+                                       // TODO: Outsource version to makefile which can compute version from git.
+                                       printf("netdata 1.1.0\n");
+                                       return 0;
+                                       break;
+                               case 'W': 
+                                       {
+                                               char* stacksize = "stacksize=";
+                                               char* debug_flags_string = "debug_flags=";
+                                               if(strcmp(optarg, "unittest") == 0) {
+                                                       rrd_update_every = 1;
+                                                       if(run_all_mockup_tests()) exit(1);
+                                                       if(unit_test_storage()) exit(1);
+                                                       fprintf(stderr, "\n\nALL TESTS PASSED\n\n");
+                                                       exit(0);
+                                               } else if(strncmp(optarg, stacksize, strlen(stacksize)) == 0) {
+                                                       optarg += strlen(stacksize);
+                                                       config_set("global", "pthread stack size", optarg);
+                                               } else if(strncmp(optarg, debug_flags_string, strlen(debug_flags_string)) == 0) {
+                                                       optarg += strlen(debug_flags_string);
+                                                       config_set("global", "debug flags",  optarg);
+                                                       debug_flags = strtoull(optarg, NULL, 0);
+                                               }
+                                       }
+                                       break;
+                               default: /* ? */
+                                       help(1);
+                                       break;
+                       }
+               } 
        }
 
        if(!config_loaded) load_config(NULL, 0);
@@ -269,8 +430,10 @@ int main(int argc, char **argv)
        setenv("NETDATA_PLUGINS_DIR", config_get("global", "plugins directory"  , PLUGINS_DIR), 1);
        setenv("NETDATA_WEB_DIR"    , config_get("global", "web files directory", WEB_DIR)    , 1);
        setenv("NETDATA_CACHE_DIR"  , config_get("global", "cache directory"    , CACHE_DIR)  , 1);
+       setenv("NETDATA_LIB_DIR"    , config_get("global", "lib directory"      , VARLIB_DIR) , 1);
        setenv("NETDATA_LOG_DIR"    , config_get("global", "log directory"      , LOG_DIR)    , 1);
        setenv("NETDATA_HOST_PREFIX", config_get("global", "host access prefix" , "")         , 1);
+       setenv("HOME"               , config_get("global", "home directory"     , CACHE_DIR)  , 1);
 
        // avoid extended to stat(/etc/localtime)
        // http://stackoverflow.com/questions/4554271/how-to-avoid-excessive-stat-etc-localtime-calls-in-strftime-on-linux
@@ -344,6 +507,12 @@ int main(int argc, char **argv)
                }
                else error_log_syslog = 0;
 
+               error_log_throttle_period = config_get_number("global", "errors flood protection period", error_log_throttle_period);
+               setenv("NETDATA_ERRORS_THROTTLE_PERIOD", config_get("global", "errors flood protection period"    , ""), 1);
+
+               error_log_errors_per_period = (unsigned long)config_get_number("global", "errors to trigger flood protection", error_log_errors_per_period);
+               setenv("NETDATA_ERRORS_PER_PERIOD"     , config_get("global", "errors to trigger flood protection", ""), 1);
+
                // --------------------------------------------------------------------
 
                access_log_file = config_get("global", "access log", LOG_DIR "/access.log");
@@ -390,13 +559,49 @@ int main(int argc, char **argv)
 
                // let the plugins know the min update_every
                {
-                       char buf[50];
-                       snprintf(buf, 50, "%d", rrd_update_every);
+                       char buf[51];
+                       snprintfz(buf, 50, "%d", rrd_update_every);
                        setenv("NETDATA_UPDATE_EVERY", buf, 1);
                }
 
                // --------------------------------------------------------------------
 
+               // block signals while initializing threads.
+               // this causes the threads to block signals.
+               sigset_t sigset;
+               sigfillset(&sigset);
+
+               if(pthread_sigmask(SIG_BLOCK, &sigset, NULL) == -1) {
+                       error("Could not block signals for threads");
+               }
+
+               // Catch signals which we want to use to quit savely
+               struct sigaction sa;
+               sigemptyset(&sa.sa_mask);
+               sigaddset(&sa.sa_mask, SIGHUP);
+               sigaddset(&sa.sa_mask, SIGINT);
+               sigaddset(&sa.sa_mask, SIGTERM);
+               sa.sa_handler = sig_handler;
+               sa.sa_flags = 0;
+               if(sigaction(SIGHUP, &sa, NULL) == -1) {
+                       error("Failed to change signal handler for SIGHUP");
+               }
+               if(sigaction(SIGINT, &sa, NULL) == -1) {
+                       error("Failed to change signal handler for SIGINT");
+               }
+               if(sigaction(SIGTERM, &sa, NULL) == -1) {
+                       error("Failed to change signal handler for SIGTERM");
+               }
+               // Ignore SIGPIPE completely.
+               // INFO: If we add signals here we have to unblock them
+               // at popen.c when running a external plugin.
+               sa.sa_handler = SIG_IGN;
+               if(sigaction(SIGPIPE, &sa, NULL) == -1) {
+                       error("Failed to change signal handler for SIGTERM");
+               }
+
+               // --------------------------------------------------------------------
+
                i = pthread_attr_init(&attr);
                if(i != 0)
                        fatal("pthread_attr_init() failed with code %d.", i);
@@ -420,51 +625,34 @@ int main(int argc, char **argv)
 
                // --------------------------------------------------------------------
 
+               // get the user we should run
+               // IMPORTANT: this is required before web_files_uid()
                user = config_get("global", "run as user"    , (getuid() == 0)?NETDATA_USER:"");
-               web_files_uid();
-
-               // --------------------------------------------------------------------
 
-               listen_backlog = (int) config_get_number("global", "http port listen backlog", LISTEN_BACKLOG);
+               // IMPORTANT: these have to run once, while single threaded
+               web_files_uid(); // IMPORTANT: web_files_uid() before web_files_gid()
+               web_files_gid();
 
-               listen_port = (int) config_get_number("global", "port", LISTEN_PORT);
-               if(listen_port < 1 || listen_port > 65535) {
-                       info("Invalid listen port %d given. Defaulting to %d.", listen_port, LISTEN_PORT);
-                       listen_port = LISTEN_PORT;
-               }
-               else debug(D_OPTIONS, "Listen port set to %d.", listen_port);
-
-               int ip = 0;
-               char *ipv = config_get("global", "ip version", "any");
-               if(!strcmp(ipv, "any") || !strcmp(ipv, "both") || !strcmp(ipv, "all")) ip = 0;
-               else if(!strcmp(ipv, "ipv4") || !strcmp(ipv, "IPV4") || !strcmp(ipv, "IPv4") || !strcmp(ipv, "4")) ip = 4;
-               else if(!strcmp(ipv, "ipv6") || !strcmp(ipv, "IPV6") || !strcmp(ipv, "IPv6") || !strcmp(ipv, "6")) ip = 6;
-               else info("Cannot understand ip version '%s'. Assuming 'any'.", ipv);
-
-               if(ip == 0 || ip == 6) listen_fd = create_listen_socket6(config_get("global", "bind socket to IP", "*"), listen_port, listen_backlog);
-               if(listen_fd < 0) {
-                       listen_fd = create_listen_socket4(config_get("global", "bind socket to IP", "*"), listen_port, listen_backlog);
-                       if(listen_fd >= 0 && ip != 4) info("Managed to open an IPv4 socket on port %d.", listen_port);
-               }
+               // --------------------------------------------------------------------
 
+               listen_fd = create_listen_socket();
                if(listen_fd < 0) fatal("Cannot listen socket.");
        }
 
        // never become a problem
        if(nice(20) == -1) error("Cannot lower my CPU priority.");
 
-       if(become_daemon(dont_fork, 0, user, input_log_file, output_log_file, error_log_file, access_log_file, &access_fd, &stdaccess) == -1) {
+       if(become_daemon(dont_fork, 0, user, input_log_file, output_log_file, error_log_file, access_log_file, &access_fd, &stdaccess) == -1)
                fatal("Cannot demonize myself.");
-               exit(1);
-       }
 
+#ifdef NETDATA_INTERNAL_CHECKS
        if(debug_flags != 0) {
                struct rlimit rl = { RLIM_INFINITY, RLIM_INFINITY };
                if(setrlimit(RLIMIT_CORE, &rl) != 0)
                        info("Cannot request unlimited core dumps for debugging... Proceeding anyway...");
-
                prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
        }
+#endif /* NETDATA_INTERNAL_CHECKS */
 
        if(output_log_syslog || error_log_syslog || access_log_syslog)
                openlog("netdata", LOG_PID, LOG_DAEMON);
@@ -472,25 +660,6 @@ int main(int argc, char **argv)
        info("NetData started on pid %d", getpid());
 
 
-       // catch all signals
-       for (i = 1 ; i < 65 ;i++) {
-               switch(i) {
-                       case SIGKILL: // not catchable
-                       case SIGSTOP: // not catchable
-                               break;
-
-                       case SIGSEGV:
-                       case SIGFPE:
-                       case SIGCHLD:
-                               signal(i, SIG_DFL);
-                               break;
-
-                       default:
-                               signal(i,  sig_handler);
-                               break;
-               }
-       }
-
        // ------------------------------------------------------------------------
        // get default pthread stack size
 
@@ -502,9 +671,16 @@ int main(int argc, char **argv)
                        info("Successfully set pthread stacksize to %zu bytes", wanted_stacksize);
        }
 
+       // --------------------------------------------------------------------
+       // initialize the registry
+
+       registry_init();
+
        // ------------------------------------------------------------------------
        // spawn the threads
 
+       web_server_threading_selection();
+
        for (i = 0; static_threads[i].name != NULL ; i++) {
                struct netdata_static_thread *st = &static_threads[i];
 
@@ -524,18 +700,22 @@ int main(int argc, char **argv)
                else info("Not starting thread %s.", st->name);
        }
 
-       // for future use - the main thread
-       while(1) {
-               if(netdata_exit != 0) {
-                       netdata_exit++;
+       // ------------------------------------------------------------------------
+       // block signals while initializing threads.
+       sigset_t sigset;
+       sigfillset(&sigset);
 
-                       if(netdata_exit > 5) {
-                               netdata_cleanup_and_exit(0);
-                               exit(0);
-                       }
-               }
-               sleep(2);
+       if(pthread_sigmask(SIG_UNBLOCK, &sigset, NULL) == -1) {
+               error("Could not unblock signals for threads");
        }
 
-       exit(0);
+       // Handle flags set in the signal handler.
+       while(1) {
+               pause();
+               if(netdata_exit) {
+                       info("Exit main loop of netdata.");
+                       netdata_cleanup_and_exit(0);
+                       exit(0);
+               }
+       }
 }