X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcollectdmon.c;h=0e2b02142d8fee7549f8067609b0b81a5d2c1963;hp=33f02b45694d889d07613a05110230c1b32d7442;hb=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4;hpb=e2b289ea039269b60edd459d2d514d3f82820e3a diff --git a/src/collectdmon.c b/src/collectdmon.c index 33f02b45..0e2b0214 100644 --- a/src/collectdmon.c +++ b/src/collectdmon.c @@ -25,7 +25,7 @@ **/ #if !defined(__GNUC__) || !__GNUC__ -# define __attribute__(x) /**/ +#define __attribute__(x) /**/ #endif #include "config.h" @@ -46,341 +46,338 @@ #include #include +#include #include #include -#include #include #include #include +#ifndef PREFIX +#define PREFIX "/opt/" PACKAGE_NAME +#endif + +#ifndef LOCALSTATEDIR +#define LOCALSTATEDIR PREFIX "/var" +#endif + #ifndef COLLECTDMON_PIDFILE -# define COLLECTDMON_PIDFILE LOCALSTATEDIR"/run/collectdmon.pid" +#define COLLECTDMON_PIDFILE LOCALSTATEDIR "/run/collectdmon.pid" #endif /* ! COLLECTDMON_PIDFILE */ #ifndef WCOREDUMP -# define WCOREDUMP(s) 0 +#define WCOREDUMP(s) 0 #endif /* ! WCOREDUMP */ -static int loop = 0; -static int restart = 0; +static int loop; +static int restart; -static char *pidfile = NULL; -static pid_t collectd_pid = 0; +static const char *pidfile; +static pid_t collectd_pid; -static void exit_usage (char *name) -{ - printf ("Usage: %s [-- ]\n" +__attribute__((noreturn)) static void exit_usage(const char *name) { + printf("Usage: %s [-- ]\n" - "\nAvailable options:\n" - " -h Display this help and exit.\n" - " -c Path to the collectd binary.\n" - " -P PID-file.\n" + "\nAvailable options:\n" + " -h Display this help and exit.\n" + " -c Path to the collectd binary.\n" + " -P PID-file.\n" - "\nFor see collectd.conf(5).\n" + "\nFor see collectd.conf(5).\n" - "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n" - "by Florian octo Forster \n" - "for contributions see `AUTHORS'\n", name); - exit (0); + "\n" PACKAGE_NAME " " PACKAGE_VERSION ", http://collectd.org/\n" + "by Florian octo Forster \n" + "for contributions see `AUTHORS'\n", + name); + exit(0); } /* exit_usage */ -static int pidfile_create (void) -{ - FILE *file = NULL; +static int pidfile_create(void) { + FILE *file; - if (NULL == pidfile) - pidfile = COLLECTDMON_PIDFILE; + if (pidfile == NULL) + pidfile = COLLECTDMON_PIDFILE; - if (NULL == (file = fopen (pidfile, "w"))) { - syslog (LOG_ERR, "Error: couldn't open PID-file (%s) for writing: %s", - pidfile, strerror (errno)); - return -1; - } + if ((file = fopen(pidfile, "w")) == NULL) { + syslog(LOG_ERR, "Error: couldn't open PID-file (%s) for writing: %s", + pidfile, strerror(errno)); + return -1; + } - fprintf (file, "%i\n", (int)getpid ()); - fclose (file); - return 0; + fprintf(file, "%d\n", (int)getpid()); + fclose(file); + return 0; } /* pidfile_create */ -static int pidfile_delete (void) -{ - assert (NULL != pidfile); +static int pidfile_delete(void) { + assert(pidfile); - if (0 != unlink (pidfile)) { - syslog (LOG_ERR, "Error: couldn't delete PID-file (%s): %s", - pidfile, strerror (errno)); - return -1; - } - return 0; + if (unlink(pidfile) != 0) { + syslog(LOG_ERR, "Error: couldn't delete PID-file (%s): %s", pidfile, + strerror(errno)); + return -1; + } + return 0; } /* pidfile_remove */ -static int daemonize (void) -{ - struct rlimit rl; - - pid_t pid = 0; - int i = 0; - - if (0 != chdir ("/")) { - fprintf (stderr, "Error: chdir() failed: %s\n", strerror (errno)); - return -1; - } - - if (0 != getrlimit (RLIMIT_NOFILE, &rl)) { - fprintf (stderr, "Error: getrlimit() failed: %s\n", strerror (errno)); - return -1; - } - - if (0 > (pid = fork ())) { - fprintf (stderr, "Error: fork() failed: %s\n", strerror (errno)); - return -1; - } - else if (pid != 0) { - exit (0); - } - - if (0 != pidfile_create ()) - return -1; - - setsid (); - - if (RLIM_INFINITY == rl.rlim_max) - rl.rlim_max = 1024; - - for (i = 0; i < (int)rl.rlim_max; ++i) - close (i); - - errno = 0; - if (open ("/dev/null", O_RDWR) != 0) { - syslog (LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s", - strerror (errno)); - return -1; - } - - errno = 0; - if (dup (0) != 1) { - syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", - strerror (errno)); - return -1; - } - - errno = 0; - if (dup (0) != 2) { - syslog (LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s", - strerror (errno)); - return -1; - } - return 0; +static int daemonize(void) { + if (chdir("/") != 0) { + fprintf(stderr, "Error: chdir() failed: %s\n", strerror(errno)); + return -1; + } + + struct rlimit rl; + if (getrlimit(RLIMIT_NOFILE, &rl) != 0) { + fprintf(stderr, "Error: getrlimit() failed: %s\n", strerror(errno)); + return -1; + } + + pid_t pid = fork(); + if (pid < 0) { + fprintf(stderr, "Error: fork() failed: %s\n", strerror(errno)); + return -1; + } else if (pid != 0) { + exit(0); + } + + if (pidfile_create() != 0) + return -1; + + setsid(); + + if (rl.rlim_max == RLIM_INFINITY) + rl.rlim_max = 1024; + + for (int i = 0; i < (int)rl.rlim_max; ++i) + close(i); + + int dev_null = open("/dev/null", O_RDWR); + if (dev_null == -1) { + syslog(LOG_ERR, "Error: couldn't open /dev/null: %s", strerror(errno)); + return -1; + } + + if (dup2(dev_null, STDIN_FILENO) == -1) { + close(dev_null); + syslog(LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s", + strerror(errno)); + return -1; + } + + if (dup2(dev_null, STDOUT_FILENO) == -1) { + close(dev_null); + syslog(LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", + strerror(errno)); + return -1; + } + + if (dup2(dev_null, STDERR_FILENO) == -1) { + close(dev_null); + syslog(LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s", + strerror(errno)); + return -1; + } + + if ((dev_null != STDIN_FILENO) && (dev_null != STDOUT_FILENO) && + (dev_null != STDERR_FILENO)) + close(dev_null); + + return 0; } /* daemonize */ -static int collectd_start (char **argv) -{ - pid_t pid = 0; - - if (0 > (pid = fork ())) { - syslog (LOG_ERR, "Error: fork() failed: %s", strerror (errno)); - return -1; - } - else if (pid != 0) { - collectd_pid = pid; - return 0; - } - - execvp (argv[0], argv); - syslog (LOG_ERR, "Error: execvp(%s) failed: %s", - argv[0], strerror (errno)); - exit (-1); +static int collectd_start(char **argv) { + pid_t pid = fork(); + + if (pid < 0) { + syslog(LOG_ERR, "Error: fork() failed: %s", strerror(errno)); + return -1; + } else if (pid != 0) { + collectd_pid = pid; + return 0; + } + + execvp(argv[0], argv); + syslog(LOG_ERR, "Error: execvp(%s) failed: %s", argv[0], strerror(errno)); + exit(-1); } /* collectd_start */ -static int collectd_stop (void) -{ - if (0 == collectd_pid) - return 0; +static int collectd_stop(void) { + if (collectd_pid == 0) + return 0; - if (0 != kill (collectd_pid, SIGTERM)) { - syslog (LOG_ERR, "Error: kill() failed: %s", strerror (errno)); - return -1; - } - return 0; + if (kill(collectd_pid, SIGTERM) != 0) { + syslog(LOG_ERR, "Error: kill() failed: %s", strerror(errno)); + return -1; + } + return 0; } /* collectd_stop */ -static void sig_int_term_handler (int __attribute__((unused)) signo) -{ - ++loop; - return; +static void sig_int_term_handler(int __attribute__((unused)) signo) { + ++loop; + return; } /* sig_int_term_handler */ -static void sig_hup_handler (int __attribute__((unused)) signo) -{ - ++restart; - return; +static void sig_hup_handler(int __attribute__((unused)) signo) { + ++restart; + return; } /* sig_hup_handler */ -static void log_status (int status) -{ - if (WIFEXITED (status)) { - if (0 == WEXITSTATUS (status)) - syslog (LOG_INFO, "Info: collectd terminated with exit status %i", - WEXITSTATUS (status)); - else - syslog (LOG_WARNING, - "Warning: collectd terminated with exit status %i", - WEXITSTATUS (status)); - } - else if (WIFSIGNALED (status)) { - syslog (LOG_WARNING, "Warning: collectd was terminated by signal %i%s", - WTERMSIG (status), WCOREDUMP (status) ? " (core dumped)" : ""); - } - return; +static void log_status(int status) { + if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == 0) + syslog(LOG_INFO, "Info: collectd terminated with exit status %i", + WEXITSTATUS(status)); + else + syslog(LOG_WARNING, "Warning: collectd terminated with exit status %i", + WEXITSTATUS(status)); + } else if (WIFSIGNALED(status)) { + syslog(LOG_WARNING, "Warning: collectd was terminated by signal %i%s", + WTERMSIG(status), WCOREDUMP(status) ? " (core dumped)" : ""); + } + return; } /* log_status */ -static void check_respawn (void) -{ - time_t t = time (NULL); +static void check_respawn(void) { + time_t t = time(NULL); - static time_t timestamp = 0; - static int counter = 0; + static time_t timestamp; + static int counter; - if ((t - 120) < timestamp) - ++counter; - else { - timestamp = t; - counter = 0; - } + if (timestamp >= t - 120) + ++counter; + else { + timestamp = t; + counter = 0; + } - if (10 < counter) { - unsigned int time_left = 300; + if (counter >= 10) { + unsigned int time_left = 300; - syslog (LOG_ERR, "Error: collectd is respawning too fast - " - "disabled for %i seconds", time_left); + syslog(LOG_ERR, "Error: collectd is respawning too fast - " + "disabled for %i seconds", + time_left); - while ((0 < (time_left = sleep (time_left))) && (0 == loop)); - } - return; + while (((time_left = sleep(time_left)) > 0) && loop == 0) + ; + } + return; } /* check_respawn */ -int main (int argc, char **argv) -{ - int collectd_argc = 0; - char *collectd = NULL; - char **collectd_argv = NULL; - - struct sigaction sa; - - int i = 0; - - /* parse command line options */ - while (42) { - int c = getopt (argc, argv, "hc:P:"); +int main(int argc, char **argv) { + int collectd_argc = 0; + char *collectd = NULL; + char **collectd_argv = NULL; + + int i = 0; + + /* parse command line options */ + while (42) { + int c = getopt(argc, argv, "hc:P:"); + + if (c == -1) + break; - if (-1 == c) - break; - - switch (c) { - case 'c': - collectd = optarg; - break; - case 'P': - pidfile = optarg; - break; - case 'h': - default: - exit_usage (argv[0]); - } - } - - for (i = optind; i < argc; ++i) - if (0 == strcmp (argv[i], "-f")) - break; - - /* i < argc => -f already present */ - collectd_argc = 1 + argc - optind + ((i < argc) ? 0 : 1); - collectd_argv = (char **)calloc (collectd_argc + 1, sizeof (char *)); - - if (NULL == collectd_argv) { - fprintf (stderr, "Out of memory."); - return 3; - } - - collectd_argv[0] = (NULL == collectd) ? "collectd" : collectd; - - if (i == argc) - collectd_argv[collectd_argc - 1] = "-f"; - - for (i = optind; i < argc; ++i) - collectd_argv[i - optind + 1] = argv[i]; - - collectd_argv[collectd_argc] = NULL; - - openlog ("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON); - - if (-1 == daemonize ()) - { - free (collectd_argv); - return 1; - } - - sa.sa_handler = sig_int_term_handler; - sa.sa_flags = 0; - sigemptyset (&sa.sa_mask); - - if (0 != sigaction (SIGINT, &sa, NULL)) { - syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); - free (collectd_argv); - return 1; - } - - if (0 != sigaction (SIGTERM, &sa, NULL)) { - syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); - free (collectd_argv); - return 1; - } - - sa.sa_handler = sig_hup_handler; - - if (0 != sigaction (SIGHUP, &sa, NULL)) { - syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); - free (collectd_argv); - return 1; - } - - while (0 == loop) { - int status = 0; - - if (0 != collectd_start (collectd_argv)) { - syslog (LOG_ERR, "Error: failed to start collectd."); - break; - } - - assert (0 < collectd_pid); - while ((collectd_pid != waitpid (collectd_pid, &status, 0)) - && (EINTR == errno)) - if ((0 != loop) || (0 != restart)) - collectd_stop (); - - collectd_pid = 0; - - log_status (status); - check_respawn (); - - if (0 != restart) { - syslog (LOG_INFO, "Info: restarting collectd"); - restart = 0; - } - else if (0 == loop) - syslog (LOG_WARNING, "Warning: restarting collectd"); - } - - syslog (LOG_INFO, "Info: shutting down collectdmon"); - - pidfile_delete (); - closelog (); - - free (collectd_argv); - return 0; + switch (c) { + case 'c': + collectd = optarg; + break; + case 'P': + pidfile = optarg; + break; + case 'h': + default: + exit_usage(argv[0]); + } + } + + for (i = optind; i < argc; ++i) + if (strcmp(argv[i], "-f") == 0) + break; + + /* i < argc => -f already present */ + collectd_argc = 1 + argc - optind + ((i < argc) ? 0 : 1); + collectd_argv = calloc(collectd_argc + 1, sizeof(*collectd_argv)); + + if (collectd_argv == NULL) { + fprintf(stderr, "Out of memory."); + return 3; + } + + collectd_argv[0] = (collectd == NULL) ? "collectd" : collectd; + + if (i == argc) + collectd_argv[collectd_argc - 1] = "-f"; + + for (i = optind; i < argc; ++i) + collectd_argv[i - optind + 1] = argv[i]; + + collectd_argv[collectd_argc] = NULL; + + openlog("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON); + + if (daemonize() == -1) { + free(collectd_argv); + return 1; + } + + struct sigaction sa = { + .sa_handler = sig_int_term_handler, .sa_flags = 0, + }; + sigemptyset(&sa.sa_mask); + + if (sigaction(SIGINT, &sa, NULL) != 0) { + syslog(LOG_ERR, "Error: sigaction() failed: %s", strerror(errno)); + free(collectd_argv); + return 1; + } + + if (sigaction(SIGTERM, &sa, NULL) != 0) { + syslog(LOG_ERR, "Error: sigaction() failed: %s", strerror(errno)); + free(collectd_argv); + return 1; + } + + sa.sa_handler = sig_hup_handler; + + if (sigaction(SIGHUP, &sa, NULL) != 0) { + syslog(LOG_ERR, "Error: sigaction() failed: %s", strerror(errno)); + free(collectd_argv); + return 1; + } + + while (loop == 0) { + int status = 0; + + if (collectd_start(collectd_argv) != 0) { + syslog(LOG_ERR, "Error: failed to start collectd."); + break; + } + + assert(collectd_pid >= 0); + while ((collectd_pid != waitpid(collectd_pid, &status, 0)) && + errno == EINTR) + if (loop != 0 || restart != 0) + collectd_stop(); + + collectd_pid = 0; + + log_status(status); + check_respawn(); + + if (restart != 0) { + syslog(LOG_INFO, "Info: restarting collectd"); + restart = 0; + } else if (loop == 0) + syslog(LOG_WARNING, "Warning: restarting collectd"); + } + + syslog(LOG_INFO, "Info: shutting down collectdmon"); + + pidfile_delete(); + closelog(); + + free(collectd_argv); + return 0; } /* main */ - -/* vim: set sw=4 ts=4 tw=78 noexpandtab : */ -