X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_daemon.c;h=abcb788348ca83314d515baecc9e91e909b6d8eb;hb=2eb6853472839cde0f48e717981a169078af74f1;hp=18b7143765935969a2467746ea473ab22a753a1d;hpb=25ae42fedeab79db1ed39f5f2d9d0fdae5172ce5;p=rrdtool.git diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index 18b7143..abcb788 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -101,10 +101,18 @@ /* * Types */ +typedef enum +{ + PRIV_LOW, + PRIV_HIGH +} socket_privilege; + struct listen_socket_s { int fd; - char path[PATH_MAX + 1]; + char addr[PATH_MAX + 1]; + int family; + socket_privilege privilege; }; typedef struct listen_socket_s listen_socket_t; @@ -168,10 +176,11 @@ static pthread_cond_t cache_cond = PTHREAD_COND_INITIALIZER; static int config_write_interval = 300; static int config_write_jitter = 0; static int config_flush_interval = 3600; +static int config_flush_at_shutdown = 0; static char *config_pid_file = NULL; static char *config_base_dir = NULL; -static char **config_listen_address_list = NULL; +static listen_socket_t **config_listen_address_list = NULL; static int config_listen_address_list_len = 0; static uint64_t stats_queue_length = 0; @@ -195,20 +204,68 @@ static void journal_rotate(void); /* * Functions */ -static void sig_int_handler (int s __attribute__((unused))) /* {{{ */ +static void sig_common (const char *sig) /* {{{ */ { - RRDD_LOG(LOG_NOTICE, "caught SIGINT"); + RRDD_LOG(LOG_NOTICE, "caught SIG%s", sig); do_shutdown++; pthread_cond_broadcast(&cache_cond); +} /* }}} void sig_common */ + +static void sig_int_handler (int s __attribute__((unused))) /* {{{ */ +{ + sig_common("INT"); } /* }}} void sig_int_handler */ static void sig_term_handler (int s __attribute__((unused))) /* {{{ */ { - RRDD_LOG(LOG_NOTICE, "caught SIGTERM"); - do_shutdown++; - pthread_cond_broadcast(&cache_cond); + sig_common("TERM"); } /* }}} void sig_term_handler */ +static void sig_usr1_handler (int s __attribute__((unused))) /* {{{ */ +{ + config_flush_at_shutdown = 1; + sig_common("USR1"); +} /* }}} void sig_usr1_handler */ + +static void sig_usr2_handler (int s __attribute__((unused))) /* {{{ */ +{ + config_flush_at_shutdown = 0; + sig_common("USR2"); +} /* }}} void sig_usr2_handler */ + +static void install_signal_handlers(void) /* {{{ */ +{ + /* These structures are static, because `sigaction' behaves weird if the are + * overwritten.. */ + static struct sigaction sa_int; + static struct sigaction sa_term; + static struct sigaction sa_pipe; + static struct sigaction sa_usr1; + static struct sigaction sa_usr2; + + /* Install signal handlers */ + memset (&sa_int, 0, sizeof (sa_int)); + sa_int.sa_handler = sig_int_handler; + sigaction (SIGINT, &sa_int, NULL); + + memset (&sa_term, 0, sizeof (sa_term)); + sa_term.sa_handler = sig_term_handler; + sigaction (SIGTERM, &sa_term, NULL); + + memset (&sa_pipe, 0, sizeof (sa_pipe)); + sa_pipe.sa_handler = SIG_IGN; + sigaction (SIGPIPE, &sa_pipe, NULL); + + memset (&sa_pipe, 0, sizeof (sa_usr1)); + sa_usr1.sa_handler = sig_usr1_handler; + sigaction (SIGUSR1, &sa_usr1, NULL); + + memset (&sa_usr2, 0, sizeof (sa_usr2)); + sa_usr2.sa_handler = sig_usr2_handler; + sigaction (SIGUSR2, &sa_usr2, NULL); + +} /* }}} void install_signal_handlers */ + static int open_pidfile(void) /* {{{ */ { int fd; @@ -224,7 +281,7 @@ static int open_pidfile(void) /* {{{ */ file, rrd_strerror(errno)); return(fd); -} +} /* }}} static int open_pidfile */ static int write_pidfile (int fd) /* {{{ */ { @@ -428,6 +485,7 @@ static int enqueue_cache_item (cache_item_t *ci, /* {{{ */ if (did_insert) { + pthread_cond_broadcast(&cache_cond); pthread_mutex_lock (&stats_lock); stats_queue_length++; pthread_mutex_unlock (&stats_lock); @@ -500,7 +558,7 @@ static int flush_old_values (int max_age) if (max_age > 0) cfd.abs_timeout = cfd.now - max_age; else - cfd.abs_timeout = cfd.now + 1; + cfd.abs_timeout = cfd.now + 2*config_write_jitter + 1; /* `tree_callback_flush' will return the keys of all values that haven't * been touched in the last `config_flush_interval' seconds in `cfd'. @@ -544,6 +602,7 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ { struct timeval now; struct timespec next_flush; + int final_flush = 0; /* make sure we only flush once on shutdown */ gettimeofday (&now, NULL); next_flush.tv_sec = now.tv_sec + config_flush_interval; @@ -581,8 +640,9 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ } /* Now, check if there's something to store away. If not, wait until - * something comes in or it's time to do the cache flush. */ - if (cache_queue_head == NULL) + * something comes in or it's time to do the cache flush. if we are + * shutting down, do not wait around. */ + if (cache_queue_head == NULL && !do_shutdown) { status = pthread_cond_timedwait (&cache_cond, &cache_lock, &next_flush); if ((status != 0) && (status != ETIMEDOUT)) @@ -592,9 +652,14 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ } } - /* We're about to shut down, so lets flush the entire tree. */ - if ((do_shutdown != 0) && (cache_queue_head == NULL)) - flush_old_values (/* max age = */ -1); + /* We're about to shut down */ + if (do_shutdown != 0 && !final_flush++) + { + if (config_flush_at_shutdown) + flush_old_values (-1); /* flush everything */ + else + break; + } /* Check if a value has arrived. This may be NULL if we timed out or there * was an interrupt such as a signal. */ @@ -659,14 +724,23 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */ pthread_mutex_lock (&cache_lock); - /* We're about to shut down, so lets flush the entire tree. */ - if ((do_shutdown != 0) && (cache_queue_head == NULL)) - flush_old_values (/* max age = */ -1); + /* We're about to shut down */ + if (do_shutdown != 0 && !final_flush++) + { + if (config_flush_at_shutdown) + flush_old_values (-1); /* flush everything */ + else + break; + } } /* while ((do_shutdown == 0) || (cache_queue_head != NULL)) */ pthread_mutex_unlock (&cache_lock); - assert(cache_queue_head == NULL); - RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed"); + if (config_flush_at_shutdown) + { + assert(cache_queue_head == NULL); + RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed"); + } + journal_done(); return (NULL); @@ -748,11 +822,13 @@ static int flush_file (const char *filename) /* {{{ */ return (ENOENT); } - /* Enqueue at head */ - enqueue_cache_item (ci, HEAD); - pthread_cond_signal (&cache_cond); + if (ci->values_num > 0) + { + /* Enqueue at head */ + enqueue_cache_item (ci, HEAD); + pthread_cond_wait(&ci->flushed, &cache_lock); + } - pthread_cond_wait(&ci->flushed, &cache_lock); pthread_mutex_unlock(&cache_lock); return (0); @@ -769,8 +845,9 @@ static int handle_request_help (int fd, /* {{{ */ char *help_help[] = { - "4 Command overview\n", + "5 Command overview\n", "FLUSH \n", + "FLUSHALL\n", "HELP []\n", "UPDATE [ ...]\n", "STATS\n" @@ -787,6 +864,15 @@ static int handle_request_help (int fd, /* {{{ */ }; size_t help_flush_len = sizeof (help_flush) / sizeof (help_flush[0]); + char *help_flushall[] = + { + "3 Help for FLUSHALL\n", + "Usage: FLUSHALL\n", + "\n", + "Triggers writing of all pending updates. Returns immediately.\n" + }; + size_t help_flushall_len = sizeof(help_flushall) / sizeof(help_flushall[0]); + char *help_update[] = { "9 Help for UPDATE\n", @@ -830,6 +916,11 @@ static int handle_request_help (int fd, /* {{{ */ help_text = help_flush; help_text_len = help_flush_len; } + else if (strcasecmp (command, "flushall") == 0) + { + help_text = help_flushall; + help_text_len = help_flushall_len; + } else if (strcasecmp (command, "stats") == 0) { help_text = help_stats; @@ -992,6 +1083,27 @@ static int handle_request_flush (int fd, /* {{{ */ return (0); } /* }}} int handle_request_flush */ +static int handle_request_flushall(int fd) /* {{{ */ +{ + int status; + char answer[] ="0 Started flush.\n"; + + RRDD_LOG(LOG_DEBUG, "Received FLUSHALL"); + + pthread_mutex_lock(&cache_lock); + flush_old_values(-1); + pthread_mutex_unlock(&cache_lock); + + status = swrite(fd, answer, strlen(answer)); + if (status < 0) + { + status = errno; + RRDD_LOG(LOG_INFO, "handle_request_flushall: swrite returned an error."); + } + + return (status); +} /* }}} static int handle_request_flushall */ + static int handle_request_update (int fd, /* {{{ */ char *buffer, size_t buffer_size) { @@ -1135,7 +1247,6 @@ static int handle_request_update (int fd, /* {{{ */ && (ci->values_num > 0)) { enqueue_cache_item (ci, TAIL); - pthread_cond_signal (&cache_cond); } pthread_mutex_unlock (&cache_lock); @@ -1188,8 +1299,28 @@ static int handle_request_wrote (int fd __attribute__((unused)), /* {{{ */ return (0); } /* }}} int handle_request_wrote */ +/* returns 1 if we have the required privilege level */ +static int has_privilege (socket_privilege priv, /* {{{ */ + socket_privilege required, int fd) +{ + int status; + char error[CMD_MAX]; + + if (priv >= required) + return 1; + + sprintf(error, "-1 %s\n", rrd_strerror(EACCES)); + status = swrite(fd, error, strlen(error)); + + if (status < 0) + return status; + else + return 0; +} /* }}} static int has_privilege */ + /* if fd < 0, we are in journal replay mode */ -static int handle_request (int fd, char *buffer, size_t buffer_size) /* {{{ */ +static int handle_request (int fd, socket_privilege privilege, /* {{{ */ + char *buffer, size_t buffer_size) { char *buffer_ptr; char *command; @@ -1212,6 +1343,10 @@ static int handle_request (int fd, char *buffer, size_t buffer_size) /* {{{ */ if (fd >= 0) journal_write(command, buffer_ptr); + status = has_privilege(privilege, PRIV_HIGH, fd); + if (status <= 0) + return status; + return (handle_request_update (fd, buffer_ptr, buffer_size)); } else if (strcasecmp (command, "wrote") == 0 && fd < 0) @@ -1223,6 +1358,14 @@ static int handle_request (int fd, char *buffer, size_t buffer_size) /* {{{ */ { return (handle_request_flush (fd, buffer_ptr, buffer_size)); } + else if (strcasecmp (command, "flushall") == 0) + { + status = has_privilege(privilege, PRIV_HIGH, fd); + if (status <= 0) + return status; + + return (handle_request_flushall(fd)); + } else if (strcasecmp (command, "stats") == 0) { return (handle_request_stats (fd, buffer_ptr, buffer_size)); @@ -1278,10 +1421,16 @@ static void journal_rotate(void) /* {{{ */ fclose(old_fh); if (journal_fh == NULL) + { RRDD_LOG(LOG_CRIT, "JOURNALING DISABLED: Cannot open journal file '%s' : (%s)", journal_cur, rrd_strerror(errno)); + RRDD_LOG(LOG_ERR, + "JOURNALING DISABLED: All values will be flushed at shutdown"); + config_flush_at_shutdown = 1; + } + } /* }}} static void journal_rotate */ static void journal_done(void) /* {{{ */ @@ -1296,10 +1445,18 @@ static void journal_done(void) /* {{{ */ journal_fh = NULL; } - RRDD_LOG(LOG_INFO, "removing journals"); + if (config_flush_at_shutdown) + { + RRDD_LOG(LOG_INFO, "removing journals"); + unlink(journal_old); + unlink(journal_cur); + } + else + { + RRDD_LOG(LOG_INFO, "expedited shutdown; " + "journals will be used at next startup"); + } - unlink(journal_old); - unlink(journal_cur); pthread_mutex_unlock(&journal_lock); } /* }}} static void journal_done */ @@ -1366,7 +1523,7 @@ static int journal_replay (const char *file) /* {{{ */ entry[entry_len - 1] = '\0'; - if (handle_request(-1, entry, entry_len) == 0) + if (handle_request(-1, PRIV_HIGH, entry, entry_len) == 0) ++entry_cnt; else ++fail_cnt; @@ -1388,11 +1545,12 @@ static int journal_replay (const char *file) /* {{{ */ static void *connection_thread_main (void *args) /* {{{ */ { pthread_t self; + listen_socket_t *sock; int i; int fd; - - fd = *((int *) args); - free (args); + + sock = (listen_socket_t *) args; + fd = sock->fd; pthread_mutex_lock (&connection_threads_lock); { @@ -1425,7 +1583,9 @@ static void *connection_thread_main (void *args) /* {{{ */ pollfd.revents = 0; status = poll (&pollfd, 1, /* timeout = */ 500); - if (status == 0) /* timeout */ + if (do_shutdown) + break; + else if (status == 0) /* timeout */ continue; else if (status < 0) /* error */ { @@ -1461,12 +1621,13 @@ static void *connection_thread_main (void *args) /* {{{ */ break; } - status = handle_request (fd, buffer, /*buffer_size=*/ status); + status = handle_request (fd, sock->privilege, buffer, status); if (status != 0) break; } close(fd); + free(args); self = pthread_self (); /* Remove this thread from the connection threads list */ @@ -1491,12 +1652,17 @@ static void *connection_thread_main (void *args) /* {{{ */ return (NULL); } /* }}} void *connection_thread_main */ -static int open_listen_socket_unix (const char *path) /* {{{ */ +static int open_listen_socket_unix (const listen_socket_t *sock) /* {{{ */ { int fd; struct sockaddr_un sa; listen_socket_t *temp; int status; + const char *path; + + path = sock->addr; + if (strncmp(path, "unix:", strlen("unix:")) == 0) + path += strlen("unix:"); temp = (listen_socket_t *) realloc (listen_fds, sizeof (listen_fds[0]) * (listen_fds_num + 1)); @@ -1506,7 +1672,7 @@ static int open_listen_socket_unix (const char *path) /* {{{ */ return (-1); } listen_fds = temp; - memset (listen_fds + listen_fds_num, 0, sizeof (listen_fds[0])); + memcpy (listen_fds + listen_fds_num, sock, sizeof (listen_fds[0])); fd = socket (PF_UNIX, SOCK_STREAM, /* protocol = */ 0); if (fd < 0) @@ -1536,17 +1702,17 @@ static int open_listen_socket_unix (const char *path) /* {{{ */ unlink (path); return (-1); } - + listen_fds[listen_fds_num].fd = fd; - snprintf (listen_fds[listen_fds_num].path, - sizeof (listen_fds[listen_fds_num].path) - 1, - "unix:%s", path); + listen_fds[listen_fds_num].family = PF_UNIX; + strncpy(listen_fds[listen_fds_num].addr, path, + sizeof (listen_fds[listen_fds_num].addr) - 1); listen_fds_num++; return (0); } /* }}} int open_listen_socket_unix */ -static int open_listen_socket (const char *addr_orig) /* {{{ */ +static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */ { struct addrinfo ai_hints; struct addrinfo *ai_res; @@ -1556,17 +1722,10 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ char *port; int status; - assert (addr_orig != NULL); - - strncpy (addr_copy, addr_orig, sizeof (addr_copy)); + strncpy (addr_copy, sock->addr, sizeof (addr_copy)); addr_copy[sizeof (addr_copy) - 1] = 0; addr = addr_copy; - if (strncmp ("unix:", addr, strlen ("unix:")) == 0) - return (open_listen_socket_unix (addr + strlen ("unix:"))); - else if (addr[0] == '/') - return (open_listen_socket_unix (addr)); - memset (&ai_hints, 0, sizeof (ai_hints)); ai_hints.ai_flags = 0; #ifdef AI_ADDRCONFIG @@ -1576,7 +1735,7 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ ai_hints.ai_socktype = SOCK_STREAM; port = NULL; - if (*addr == '[') /* IPv6+port format */ + if (*addr == '[') /* IPv6+port format */ { /* `addr' is something like "[2001:780:104:2:211:24ff:feab:26f8]:12345" */ addr++; @@ -1584,8 +1743,8 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ port = strchr (addr, ']'); if (port == NULL) { - RRDD_LOG (LOG_ERR, "open_listen_socket: Malformed address: %s", - addr_orig); + RRDD_LOG (LOG_ERR, "open_listen_socket_network: Malformed address: %s", + sock->addr); return (-1); } *port = 0; @@ -1597,7 +1756,7 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ port = NULL; else { - RRDD_LOG (LOG_ERR, "open_listen_socket: Garbage after address: %s", + RRDD_LOG (LOG_ERR, "open_listen_socket_network: Garbage after address: %s", port); return (-1); } @@ -1617,7 +1776,7 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ &ai_hints, &ai_res); if (status != 0) { - RRDD_LOG (LOG_ERR, "open_listen_socket: getaddrinfo(%s) failed: " + RRDD_LOG (LOG_ERR, "open_listen_socket_network: getaddrinfo(%s) failed: " "%s", addr, gai_strerror (status)); return (-1); } @@ -1632,16 +1791,16 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ sizeof (listen_fds[0]) * (listen_fds_num + 1)); if (temp == NULL) { - RRDD_LOG (LOG_ERR, "open_listen_socket: realloc failed."); + RRDD_LOG (LOG_ERR, "open_listen_socket_network: realloc failed."); continue; } listen_fds = temp; - memset (listen_fds + listen_fds_num, 0, sizeof (listen_fds[0])); + memcpy (listen_fds + listen_fds_num, sock, sizeof (listen_fds[0])); fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); if (fd < 0) { - RRDD_LOG (LOG_ERR, "open_listen_socket: socket(2) failed."); + RRDD_LOG (LOG_ERR, "open_listen_socket_network: socket(2) failed."); continue; } @@ -1650,7 +1809,7 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ status = bind (fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen); if (status != 0) { - RRDD_LOG (LOG_ERR, "open_listen_socket: bind(2) failed."); + RRDD_LOG (LOG_ERR, "open_listen_socket_network: bind(2) failed."); close (fd); continue; } @@ -1658,18 +1817,29 @@ static int open_listen_socket (const char *addr_orig) /* {{{ */ status = listen (fd, /* backlog = */ 10); if (status != 0) { - RRDD_LOG (LOG_ERR, "open_listen_socket: listen(2) failed."); + RRDD_LOG (LOG_ERR, "open_listen_socket_network: listen(2) failed."); close (fd); return (-1); } listen_fds[listen_fds_num].fd = fd; - strncpy (listen_fds[listen_fds_num].path, addr, - sizeof (listen_fds[listen_fds_num].path) - 1); + listen_fds[listen_fds_num].family = ai_ptr->ai_family; listen_fds_num++; } /* for (ai_ptr) */ return (0); +} /* }}} static int open_listen_socket_network */ + +static int open_listen_socket (const listen_socket_t *sock) /* {{{ */ +{ + assert(sock != NULL); + assert(sock->addr != NULL); + + if (strncmp ("unix:", sock->addr, strlen ("unix:")) == 0 + || sock->addr[0] == '/') + return (open_listen_socket_unix(sock)); + else + return (open_listen_socket_network(sock)); } /* }}} int open_listen_socket */ static int close_listen_sockets (void) /* {{{ */ @@ -1679,8 +1849,9 @@ static int close_listen_sockets (void) /* {{{ */ for (i = 0; i < listen_fds_num; i++) { close (listen_fds[i].fd); - if (strncmp ("unix:", listen_fds[i].path, strlen ("unix:")) == 0) - unlink (listen_fds[i].path + strlen ("unix:")); + + if (listen_fds[i].family == PF_UNIX) + unlink(listen_fds[i].addr); } free (listen_fds); @@ -1701,7 +1872,12 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ open_listen_socket (config_listen_address_list[i]); if (config_listen_address_list_len < 1) - open_listen_socket (RRDCACHED_DEFAULT_ADDRESS); + { + listen_socket_t sock; + memset(&sock, 0, sizeof(sock)); + strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr)); + open_listen_socket (&sock); + } if (listen_fds_num < 1) { @@ -1732,11 +1908,11 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ } status = poll (pollfds, pollfds_num, /* timeout = */ 1000); - if (status == 0) - { - continue; /* timeout */ - } - else if (status < 0) + if (do_shutdown) + break; + else if (status == 0) /* timeout */ + continue; + else if (status < 0) /* error */ { status = errno; if (status != EINTR) @@ -1748,7 +1924,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ for (i = 0; i < pollfds_num; i++) { - int *client_sd; + listen_socket_t *client_sock; struct sockaddr_storage client_sa; socklen_t client_sa_size; pthread_t tid; @@ -1765,19 +1941,21 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ continue; } - client_sd = (int *) malloc (sizeof (int)); - if (client_sd == NULL) + client_sock = (listen_socket_t *) malloc (sizeof (listen_socket_t)); + if (client_sock == NULL) { RRDD_LOG (LOG_ERR, "listen_thread_main: malloc failed."); continue; } + memcpy(client_sock, &listen_fds[i], sizeof(listen_fds[0])); client_sa_size = sizeof (client_sa); - *client_sd = accept (pollfds[i].fd, + client_sock->fd = accept (pollfds[i].fd, (struct sockaddr *) &client_sa, &client_sa_size); - if (*client_sd < 0) + if (client_sock->fd < 0) { RRDD_LOG (LOG_ERR, "listen_thread_main: accept(2) failed."); + free(client_sock); continue; } @@ -1785,12 +1963,12 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */ pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); status = pthread_create (&tid, &attr, connection_thread_main, - /* args = */ (void *) client_sd); + client_sock); if (status != 0) { RRDD_LOG (LOG_ERR, "listen_thread_main: pthread_create failed."); - close (*client_sd); - free (client_sd); + close (client_sock->fd); + free (client_sock); continue; } } /* for (pollfds_num) */ @@ -1821,12 +1999,6 @@ static int daemonize (void) /* {{{ */ int status; int fd; - /* These structures are static, because `sigaction' behaves weird if the are - * overwritten.. */ - static struct sigaction sa_int; - static struct sigaction sa_term; - static struct sigaction sa_pipe; - fd = open_pidfile(); if (fd < 0) return fd; @@ -1870,18 +2042,7 @@ static int daemonize (void) /* {{{ */ dup (0); } /* if (!stay_foreground) */ - /* Install signal handlers */ - memset (&sa_int, 0, sizeof (sa_int)); - sa_int.sa_handler = sig_int_handler; - sigaction (SIGINT, &sa_int, NULL); - - memset (&sa_term, 0, sizeof (sa_term)); - sa_term.sa_handler = sig_term_handler; - sigaction (SIGTERM, &sa_term, NULL); - - memset (&sa_pipe, 0, sizeof (sa_pipe)); - sa_pipe.sa_handler = SIG_IGN; - sigaction (SIGPIPE, &sa_pipe, NULL); + install_signal_handlers(); openlog ("rrdcached", LOG_PID, LOG_DAEMON); RRDD_LOG(LOG_INFO, "starting up"); @@ -1917,7 +2078,7 @@ static int read_options (int argc, char **argv) /* {{{ */ int option; int status = 0; - while ((option = getopt(argc, argv, "gl:f:w:b:z:p:j:h?")) != -1) + while ((option = getopt(argc, argv, "gl:L:f:w:b:z:p:j:h?F")) != -1) { switch (option) { @@ -1925,12 +2086,22 @@ static int read_options (int argc, char **argv) /* {{{ */ stay_foreground=1; break; + case 'L': case 'l': { - char **temp; + listen_socket_t **temp; + listen_socket_t *new; + + new = malloc(sizeof(listen_socket_t)); + if (new == NULL) + { + fprintf(stderr, "read_options: malloc failed.\n"); + return(2); + } + memset(new, 0, sizeof(listen_socket_t)); - temp = (char **) realloc (config_listen_address_list, - sizeof (char *) * (config_listen_address_list_len + 1)); + temp = (listen_socket_t **) realloc (config_listen_address_list, + sizeof (listen_socket_t *) * (config_listen_address_list_len + 1)); if (temp == NULL) { fprintf (stderr, "read_options: realloc failed.\n"); @@ -1938,12 +2109,10 @@ static int read_options (int argc, char **argv) /* {{{ */ } config_listen_address_list = temp; - temp[config_listen_address_list_len] = strdup (optarg); - if (temp[config_listen_address_list_len] == NULL) - { - fprintf (stderr, "read_options: strdup failed.\n"); - return (2); - } + strncpy(new->addr, optarg, sizeof(new->addr)-1); + new->privilege = (option == 'l') ? PRIV_HIGH : PRIV_LOW; + + temp[config_listen_address_list_len] = new; config_listen_address_list_len++; } break; @@ -2035,6 +2204,10 @@ static int read_options (int argc, char **argv) /* {{{ */ } break; + case 'F': + config_flush_at_shutdown = 1; + break; + case 'j': { struct stat statbuf; @@ -2078,6 +2251,7 @@ static int read_options (int argc, char **argv) /* {{{ */ "\n" "Valid options are:\n" " -l
Socket address to listen to.\n" + " -L
Socket address to listen to ('FLUSH' only).\n" " -w Interval in which to write data.\n" " -z Delay writes up to seconds to spread load\n" " -f Interval in which to flush dead data.\n" @@ -2085,6 +2259,7 @@ static int read_options (int argc, char **argv) /* {{{ */ " -b Base directory to change to.\n" " -g Do not fork and run in the foreground.\n" " -j Directory in which to create the journal files.\n" + " -F Always flush all updates at shutdown\n" "\n" "For more information and a detailed description of all options " "please refer\n" @@ -2103,6 +2278,9 @@ static int read_options (int argc, char **argv) /* {{{ */ fprintf(stderr, "WARNING: write delay (-z) should NOT be larger than" " write interval (-w) !\n"); + if (journal_cur == NULL) + config_flush_at_shutdown = 1; + return (status); } /* }}} int read_options */