**/
#include "collectd.h"
-#include "common.h"
-#include "plugin.h"
+#include "common.h"
#include "configfile.h"
+#include "plugin.h"
+#include <netdb.h>
#include <sys/types.h>
#include <sys/un.h>
-#include <netdb.h>
-
-#include <pthread.h>
#if HAVE_LOCALE_H
-# include <locale.h>
+#include <locale.h>
#endif
#if HAVE_STATGRAB_H
-# include <statgrab.h>
+#include <statgrab.h>
#endif
#ifndef COLLECTD_LOCALE
-# define COLLECTD_LOCALE "C"
+#define COLLECTD_LOCALE "C"
#endif
/*
*/
char hostname_g[DATA_MAX_NAME_LEN];
cdtime_t interval_g;
-int pidfile_from_cli = 0;
-int timeout_g;
+int timeout_g;
#if HAVE_LIBKSTAT
kstat_ctl_t *kc;
#endif /* HAVE_LIBKSTAT */
static int loop = 0;
-static void *do_flush (void __attribute__((unused)) *arg)
-{
- INFO ("Flushing all data.");
- plugin_flush (/* plugin = */ NULL,
- /* timeout = */ 0,
- /* ident = */ NULL);
- INFO ("Finished flushing all data.");
- pthread_exit (NULL);
- return NULL;
+static void *do_flush(void __attribute__((unused)) * arg) {
+ INFO("Flushing all data.");
+ plugin_flush(/* plugin = */ NULL,
+ /* timeout = */ 0,
+ /* ident = */ NULL);
+ INFO("Finished flushing all data.");
+ pthread_exit(NULL);
+ return NULL;
}
-static void sig_int_handler (int __attribute__((unused)) signal)
-{
- loop++;
-}
+static void sig_int_handler(int __attribute__((unused)) signal) { loop++; }
-static void sig_term_handler (int __attribute__((unused)) signal)
-{
- loop++;
-}
+static void sig_term_handler(int __attribute__((unused)) signal) { loop++; }
+
+static void sig_usr1_handler(int __attribute__((unused)) signal) {
+ pthread_t thread;
+ pthread_attr_t attr;
-static void sig_usr1_handler (int __attribute__((unused)) signal)
-{
- pthread_t thread;
- pthread_attr_t attr;
-
- /* flushing the data might take a while,
- * so it should be done asynchronously */
- pthread_attr_init (&attr);
- pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
- pthread_create (&thread, &attr, do_flush, NULL);
- pthread_attr_destroy (&attr);
+ /* flushing the data might take a while,
+ * so it should be done asynchronously */
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ pthread_create(&thread, &attr, do_flush, NULL);
+ pthread_attr_destroy(&attr);
}
-static int init_hostname (void)
-{
- const char *str;
-
- struct addrinfo ai_hints;
- struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
- int status;
-
- str = global_option_get ("Hostname");
- if (str != NULL)
- {
- sstrncpy (hostname_g, str, sizeof (hostname_g));
- return (0);
- }
-
- if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
- {
- fprintf (stderr, "`gethostname' failed and no "
- "hostname was configured.\n");
- return (-1);
- }
-
- str = global_option_get ("FQDNLookup");
- if (IS_FALSE (str))
- return (0);
-
- memset (&ai_hints, '\0', sizeof (ai_hints));
- ai_hints.ai_flags = AI_CANONNAME;
-
- status = getaddrinfo (hostname_g, NULL, &ai_hints, &ai_list);
- if (status != 0)
- {
- ERROR ("Looking up \"%s\" failed. You have set the "
- "\"FQDNLookup\" option, but I cannot resolve "
- "my hostname to a fully qualified domain "
- "name. Please fix the network "
- "configuration.", hostname_g);
- return (-1);
- }
-
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
- {
- if (ai_ptr->ai_canonname == NULL)
- continue;
-
- sstrncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
- break;
- }
-
- freeaddrinfo (ai_list);
- return (0);
+static int init_hostname(void) {
+ const char *str;
+
+ struct addrinfo *ai_list;
+ int status;
+
+ str = global_option_get("Hostname");
+ if (str != NULL) {
+ sstrncpy(hostname_g, str, sizeof(hostname_g));
+ return (0);
+ }
+
+ if (gethostname(hostname_g, sizeof(hostname_g)) != 0) {
+ fprintf(stderr, "`gethostname' failed and no "
+ "hostname was configured.\n");
+ return (-1);
+ }
+
+ str = global_option_get("FQDNLookup");
+ if (IS_FALSE(str))
+ return (0);
+
+ struct addrinfo ai_hints = {.ai_flags = AI_CANONNAME};
+
+ status = getaddrinfo(hostname_g, NULL, &ai_hints, &ai_list);
+ if (status != 0) {
+ ERROR("Looking up \"%s\" failed. You have set the "
+ "\"FQDNLookup\" option, but I cannot resolve "
+ "my hostname to a fully qualified domain "
+ "name. Please fix the network "
+ "configuration.",
+ hostname_g);
+ return (-1);
+ }
+
+ for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL;
+ ai_ptr = ai_ptr->ai_next) {
+ if (ai_ptr->ai_canonname == NULL)
+ continue;
+
+ sstrncpy(hostname_g, ai_ptr->ai_canonname, sizeof(hostname_g));
+ break;
+ }
+
+ freeaddrinfo(ai_list);
+ return (0);
} /* int init_hostname */
-static int init_global_variables (void)
-{
- char const *str;
-
- interval_g = cf_get_default_interval ();
- assert (interval_g > 0);
- DEBUG ("interval_g = %.3f;", CDTIME_T_TO_DOUBLE (interval_g));
-
- str = global_option_get ("Timeout");
- if (str == NULL)
- str = "2";
- timeout_g = atoi (str);
- if (timeout_g <= 1)
- {
- fprintf (stderr, "Cannot set the timeout to a correct value.\n"
- "Please check your settings.\n");
- return (-1);
- }
- DEBUG ("timeout_g = %i;", timeout_g);
-
- if (init_hostname () != 0)
- return (-1);
- DEBUG ("hostname_g = %s;", hostname_g);
-
- return (0);
+static int init_global_variables(void) {
+ char const *str;
+
+ interval_g = cf_get_default_interval();
+ assert(interval_g > 0);
+ DEBUG("interval_g = %.3f;", CDTIME_T_TO_DOUBLE(interval_g));
+
+ str = global_option_get("Timeout");
+ if (str == NULL)
+ str = "2";
+ timeout_g = atoi(str);
+ if (timeout_g <= 1) {
+ fprintf(stderr, "Cannot set the timeout to a correct value.\n"
+ "Please check your settings.\n");
+ return (-1);
+ }
+ DEBUG("timeout_g = %i;", timeout_g);
+
+ if (init_hostname() != 0)
+ return (-1);
+ DEBUG("hostname_g = %s;", hostname_g);
+
+ return (0);
} /* int init_global_variables */
-static int change_basedir (const char *orig_dir)
-{
- char *dir;
- size_t dirlen;
- int status;
-
- dir = strdup (orig_dir);
- if (dir == NULL)
- {
- char errbuf[1024];
- ERROR ("strdup failed: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (-1);
- }
-
- dirlen = strlen (dir);
- while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
- dir[--dirlen] = '\0';
-
- if (dirlen == 0) {
- free (dir);
- return (-1);
- }
-
- status = chdir (dir);
- if (status == 0)
- {
- free (dir);
- return (0);
- }
- else if (errno != ENOENT)
- {
- char errbuf[1024];
- ERROR ("change_basedir: chdir (%s): %s", dir,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- free (dir);
- return (-1);
- }
-
- status = mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO);
- if (status != 0)
- {
- char errbuf[1024];
- ERROR ("change_basedir: mkdir (%s): %s", dir,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- free (dir);
- return (-1);
- }
-
- status = chdir (dir);
- if (status != 0)
- {
- char errbuf[1024];
- ERROR ("change_basedir: chdir (%s): %s", dir,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- free (dir);
- return (-1);
- }
-
- free (dir);
- return (0);
+static int change_basedir(const char *orig_dir) {
+ char *dir;
+ size_t dirlen;
+ int status;
+
+ dir = strdup(orig_dir);
+ if (dir == NULL) {
+ char errbuf[1024];
+ ERROR("strdup failed: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (-1);
+ }
+
+ dirlen = strlen(dir);
+ while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
+ dir[--dirlen] = '\0';
+
+ if (dirlen == 0) {
+ free(dir);
+ return (-1);
+ }
+
+ status = chdir(dir);
+ if (status == 0) {
+ free(dir);
+ return (0);
+ } else if (errno != ENOENT) {
+ char errbuf[1024];
+ ERROR("change_basedir: chdir (%s): %s", dir,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ free(dir);
+ return (-1);
+ }
+
+ status = mkdir(dir, S_IRWXU | S_IRWXG | S_IRWXO);
+ if (status != 0) {
+ char errbuf[1024];
+ ERROR("change_basedir: mkdir (%s): %s", dir,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ free(dir);
+ return (-1);
+ }
+
+ status = chdir(dir);
+ if (status != 0) {
+ char errbuf[1024];
+ ERROR("change_basedir: chdir (%s): %s", dir,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ free(dir);
+ return (-1);
+ }
+
+ free(dir);
+ return (0);
} /* static int change_basedir (char *dir) */
#if HAVE_LIBKSTAT
-static void update_kstat (void)
-{
- if (kc == NULL)
- {
- if ((kc = kstat_open ()) == NULL)
- ERROR ("Unable to open kstat control structure");
- }
- else
- {
- kid_t kid;
- kid = kstat_chain_update (kc);
- if (kid > 0)
- {
- INFO ("kstat chain has been updated");
- plugin_init_all ();
- }
- else if (kid < 0)
- ERROR ("kstat chain update failed");
- /* else: everything works as expected */
- }
-
- return;
+static void update_kstat(void) {
+ if (kc == NULL) {
+ if ((kc = kstat_open()) == NULL)
+ ERROR("Unable to open kstat control structure");
+ } else {
+ kid_t kid;
+ kid = kstat_chain_update(kc);
+ if (kid > 0) {
+ INFO("kstat chain has been updated");
+ plugin_init_all();
+ } else if (kid < 0)
+ ERROR("kstat chain update failed");
+ /* else: everything works as expected */
+ }
+
+ return;
} /* static void update_kstat (void) */
#endif /* HAVE_LIBKSTAT */
/* TODO
* Remove all settings but `-f' and `-C'
*/
-__attribute__((noreturn))
-static void exit_usage (int status)
-{
- printf ("Usage: "PACKAGE_NAME" [OPTIONS]\n\n"
-
- "Available options:\n"
- " General:\n"
- " -C <file> Configuration file.\n"
- " Default: "CONFIGFILE"\n"
- " -t Test config and exit.\n"
- " -T Test plugin read and exit.\n"
- " -P <file> PID-file.\n"
- " Default: "PIDFILE"\n"
+__attribute__((noreturn)) static void exit_usage(int status) {
+ printf("Usage: " PACKAGE_NAME " [OPTIONS]\n\n"
+
+ "Available options:\n"
+ " General:\n"
+ " -C <file> Configuration file.\n"
+ " Default: " CONFIGFILE "\n"
+ " -t Test config and exit.\n"
+ " -T Test plugin read and exit.\n"
+ " -P <file> PID-file.\n"
+ " Default: " PIDFILE "\n"
#if COLLECT_DAEMON
- " -f Don't fork to the background.\n"
+ " -f Don't fork to the background.\n"
#endif
- " -h Display help (this message)\n"
- "\nBuiltin defaults:\n"
- " Config file "CONFIGFILE"\n"
- " PID file "PIDFILE"\n"
- " Plugin directory "PLUGINDIR"\n"
- " Data directory "PKGLOCALSTATEDIR"\n"
- "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n"
- "by Florian octo Forster <octo@collectd.org>\n"
- "for contributions see `AUTHORS'\n");
- exit (status);
+ " -h Display help (this message)\n"
+ "\nBuiltin defaults:\n"
+ " Config file " CONFIGFILE "\n"
+ " PID file " PIDFILE "\n"
+ " Plugin directory " PLUGINDIR "\n"
+ " Data directory " PKGLOCALSTATEDIR "\n"
+ "\n" PACKAGE_NAME " " PACKAGE_VERSION ", http://collectd.org/\n"
+ "by Florian octo Forster <octo@collectd.org>\n"
+ "for contributions see `AUTHORS'\n");
+ exit(status);
} /* static void exit_usage (int status) */
-static int do_init (void)
-{
+static int do_init(void) {
#if HAVE_SETLOCALE
- if (setlocale (LC_NUMERIC, COLLECTD_LOCALE) == NULL)
- WARNING ("setlocale (\"%s\") failed.", COLLECTD_LOCALE);
+ if (setlocale(LC_NUMERIC, COLLECTD_LOCALE) == NULL)
+ WARNING("setlocale (\"%s\") failed.", COLLECTD_LOCALE);
- /* Update the environment, so that libraries that are calling
- * setlocale(LC_NUMERIC, "") don't accidentally revert these changes. */
- unsetenv ("LC_ALL");
- setenv ("LC_NUMERIC", COLLECTD_LOCALE, /* overwrite = */ 1);
+ /* Update the environment, so that libraries that are calling
+ * setlocale(LC_NUMERIC, "") don't accidentally revert these changes. */
+ unsetenv("LC_ALL");
+ setenv("LC_NUMERIC", COLLECTD_LOCALE, /* overwrite = */ 1);
#endif
#if HAVE_LIBKSTAT
- kc = NULL;
- update_kstat ();
+ kc = NULL;
+ update_kstat();
#endif
#if HAVE_LIBSTATGRAB
- if (sg_init (
-# if HAVE_LIBSTATGRAB_0_90
- 0
-# endif
- ))
- {
- ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
- return (-1);
- }
-
- if (sg_drop_privileges ())
- {
- ERROR ("sg_drop_privileges: %s", sg_str_error (sg_get_error ()));
- return (-1);
- }
+ if (sg_init(
+#if HAVE_LIBSTATGRAB_0_90
+ 0
+#endif
+ )) {
+ ERROR("sg_init: %s", sg_str_error(sg_get_error()));
+ return (-1);
+ }
+
+ if (sg_drop_privileges()) {
+ ERROR("sg_drop_privileges: %s", sg_str_error(sg_get_error()));
+ return (-1);
+ }
#endif
- return plugin_init_all ();
+ return plugin_init_all();
} /* int do_init () */
+static int do_loop(void) {
+ cdtime_t interval = cf_get_default_interval();
+ cdtime_t wait_until;
-static int do_loop (void)
-{
- cdtime_t interval = cf_get_default_interval ();
- cdtime_t wait_until;
-
- wait_until = cdtime () + interval;
+ wait_until = cdtime() + interval;
- while (loop == 0)
- {
- struct timespec ts_wait = { 0, 0 };
- cdtime_t now;
+ while (loop == 0) {
+ struct timespec ts_wait = {0, 0};
+ cdtime_t now;
#if HAVE_LIBKSTAT
- update_kstat ();
+ update_kstat();
#endif
- /* Issue all plugins */
- plugin_read_all ();
-
- now = cdtime ();
- if (now >= wait_until)
- {
- WARNING ("Not sleeping because the next interval is "
- "%.3f seconds in the past!",
- CDTIME_T_TO_DOUBLE (now - wait_until));
- wait_until = now + interval;
- continue;
- }
-
- CDTIME_T_TO_TIMESPEC (wait_until - now, &ts_wait);
- wait_until = wait_until + interval;
-
- while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) != 0))
- {
- if (errno != EINTR)
- {
- char errbuf[1024];
- ERROR ("nanosleep failed: %s",
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
- return (-1);
- }
- }
- } /* while (loop == 0) */
-
- return (0);
+ /* Issue all plugins */
+ plugin_read_all();
+
+ now = cdtime();
+ if (now >= wait_until) {
+ WARNING("Not sleeping because the next interval is "
+ "%.3f seconds in the past!",
+ CDTIME_T_TO_DOUBLE(now - wait_until));
+ wait_until = now + interval;
+ continue;
+ }
+
+ CDTIME_T_TO_TIMESPEC(wait_until - now, &ts_wait);
+ wait_until = wait_until + interval;
+
+ while ((loop == 0) && (nanosleep(&ts_wait, &ts_wait) != 0)) {
+ if (errno != EINTR) {
+ char errbuf[1024];
+ ERROR("nanosleep failed: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (-1);
+ }
+ }
+ } /* while (loop == 0) */
+
+ return (0);
} /* int do_loop */
-static int do_shutdown (void)
-{
- return plugin_shutdown_all ();
+static int do_shutdown(void) {
+ return plugin_shutdown_all();
} /* int do_shutdown */
#if COLLECT_DAEMON
-static int pidfile_create (void)
-{
- FILE *fh;
- const char *file = global_option_get ("PIDFile");
-
- if ((fh = fopen (file, "w")) == NULL)
- {
- char errbuf[1024];
- ERROR ("fopen (%s): %s", file,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (1);
- }
-
- fprintf (fh, "%i\n", (int) getpid ());
- fclose(fh);
-
- return (0);
+static int pidfile_create(void) {
+ FILE *fh;
+ const char *file = global_option_get("PIDFile");
+
+ if ((fh = fopen(file, "w")) == NULL) {
+ char errbuf[1024];
+ ERROR("fopen (%s): %s", file, sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (1);
+ }
+
+ fprintf(fh, "%i\n", (int)getpid());
+ fclose(fh);
+
+ return (0);
} /* static int pidfile_create (const char *file) */
-static int pidfile_remove (void)
-{
- const char *file = global_option_get ("PIDFile");
- if (file == NULL)
- return 0;
+static int pidfile_remove(void) {
+ const char *file = global_option_get("PIDFile");
+ if (file == NULL)
+ return 0;
- return (unlink (file));
+ return (unlink(file));
} /* static int pidfile_remove (const char *file) */
#endif /* COLLECT_DAEMON */
#ifdef KERNEL_LINUX
-static int notify_upstart (void)
-{
- char const *upstart_job = getenv("UPSTART_JOB");
+static int notify_upstart(void) {
+ char const *upstart_job = getenv("UPSTART_JOB");
- if (upstart_job == NULL)
- return 0;
+ if (upstart_job == NULL)
+ return 0;
- if (strcmp(upstart_job, "collectd") != 0)
- {
- WARNING ("Environment specifies unexpected UPSTART_JOB=\"%s\", expected \"collectd\". Ignoring the variable.", upstart_job);
- return 0;
- }
+ if (strcmp(upstart_job, "collectd") != 0) {
+ WARNING("Environment specifies unexpected UPSTART_JOB=\"%s\", expected "
+ "\"collectd\". Ignoring the variable.",
+ upstart_job);
+ return 0;
+ }
- NOTICE("Upstart detected, stopping now to signal readyness.");
- raise(SIGSTOP);
- unsetenv("UPSTART_JOB");
+ NOTICE("Upstart detected, stopping now to signal readyness.");
+ raise(SIGSTOP);
+ unsetenv("UPSTART_JOB");
- return 1;
+ return 1;
}
-static int notify_systemd (void)
-{
- int fd;
- const char *notifysocket;
- struct sockaddr_un su;
- size_t su_size;
- char buffer[] = "READY=1\n";
-
- notifysocket = getenv ("NOTIFY_SOCKET");
- if (notifysocket == NULL)
- return 0;
-
- if ((strlen (notifysocket) < 2)
- || ((notifysocket[0] != '@') && (notifysocket[0] != '/')))
- {
- ERROR ("invalid notification socket NOTIFY_SOCKET=\"%s\": path must be absolute", notifysocket);
- return 0;
- }
- NOTICE ("Systemd detected, trying to signal readyness.");
+static int notify_systemd(void) {
+ int fd;
+ const char *notifysocket;
+ struct sockaddr_un su = {0};
+ size_t su_size;
+ char buffer[] = "READY=1\n";
+
+ notifysocket = getenv("NOTIFY_SOCKET");
+ if (notifysocket == NULL)
+ return 0;
- unsetenv ("NOTIFY_SOCKET");
+ if ((strlen(notifysocket) < 2) ||
+ ((notifysocket[0] != '@') && (notifysocket[0] != '/'))) {
+ ERROR("invalid notification socket NOTIFY_SOCKET=\"%s\": path must be "
+ "absolute",
+ notifysocket);
+ return 0;
+ }
+ NOTICE("Systemd detected, trying to signal readyness.");
+
+ unsetenv("NOTIFY_SOCKET");
#if defined(SOCK_CLOEXEC)
- fd = socket (AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, /* protocol = */ 0);
+ fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, /* protocol = */ 0);
#else
- fd = socket (AF_UNIX, SOCK_DGRAM, /* protocol = */ 0);
+ fd = socket(AF_UNIX, SOCK_DGRAM, /* protocol = */ 0);
#endif
- if (fd < 0) {
- char errbuf[1024];
- ERROR ("creating UNIX socket failed: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return 0;
- }
-
- memset (&su, 0, sizeof (su));
- su.sun_family = AF_UNIX;
- if (notifysocket[0] != '@')
- {
- /* regular UNIX socket */
- sstrncpy (su.sun_path, notifysocket, sizeof (su.sun_path));
- su_size = sizeof (su);
- }
- else
- {
- /* Linux abstract namespace socket: specify address as "\0foo", i.e.
- * start with a null byte. Since null bytes have no special meaning in
- * that case, we have to set su_size correctly to cover only the bytes
- * that are part of the address. */
- sstrncpy (su.sun_path, notifysocket, sizeof (su.sun_path));
- su.sun_path[0] = 0;
- su_size = sizeof (sa_family_t) + strlen (notifysocket);
- if (su_size > sizeof (su))
- su_size = sizeof (su);
- }
-
- if (sendto (fd, buffer, strlen (buffer), MSG_NOSIGNAL, (void *) &su, (socklen_t) su_size) < 0)
- {
- char errbuf[1024];
- ERROR ("sendto(\"%s\") failed: %s", notifysocket,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- close(fd);
- return 0;
- }
-
- unsetenv ("NOTIFY_SOCKET");
+ if (fd < 0) {
+ char errbuf[1024];
+ ERROR("creating UNIX socket failed: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ return 0;
+ }
+
+ su.sun_family = AF_UNIX;
+ if (notifysocket[0] != '@') {
+ /* regular UNIX socket */
+ sstrncpy(su.sun_path, notifysocket, sizeof(su.sun_path));
+ su_size = sizeof(su);
+ } else {
+ /* Linux abstract namespace socket: specify address as "\0foo", i.e.
+ * start with a null byte. Since null bytes have no special meaning in
+ * that case, we have to set su_size correctly to cover only the bytes
+ * that are part of the address. */
+ sstrncpy(su.sun_path, notifysocket, sizeof(su.sun_path));
+ su.sun_path[0] = 0;
+ su_size = sizeof(sa_family_t) + strlen(notifysocket);
+ if (su_size > sizeof(su))
+ su_size = sizeof(su);
+ }
+
+ if (sendto(fd, buffer, strlen(buffer), MSG_NOSIGNAL, (void *)&su,
+ (socklen_t)su_size) < 0) {
+ char errbuf[1024];
+ ERROR("sendto(\"%s\") failed: %s", notifysocket,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
close(fd);
- return 1;
+ return 0;
+ }
+
+ unsetenv("NOTIFY_SOCKET");
+ close(fd);
+ return 1;
}
#endif /* KERNEL_LINUX */
-int main (int argc, char **argv)
-{
- struct sigaction sig_int_action;
- struct sigaction sig_term_action;
- struct sigaction sig_usr1_action;
- struct sigaction sig_pipe_action;
- const char *configfile = CONFIGFILE;
- int test_config = 0;
- int test_readall = 0;
- const char *basedir;
+int main(int argc, char **argv) {
+ const char *configfile = CONFIGFILE;
+ int test_config = 0;
+ int test_readall = 0;
+ const char *basedir;
#if COLLECT_DAEMON
- struct sigaction sig_chld_action;
- pid_t pid;
- int daemonize = 1;
+ pid_t pid;
+ int daemonize = 1;
#endif
- int exit_status = 0;
+ int exit_status = 0;
- /* read options */
- while (1)
- {
- int c;
+ /* read options */
+ while (1) {
+ int c;
- c = getopt (argc, argv, "htTC:"
+ c = getopt(argc, argv, "htTC:"
#if COLLECT_DAEMON
- "fP:"
+ "fP:"
#endif
- );
-
- if (c == -1)
- break;
-
- switch (c)
- {
- case 'C':
- configfile = optarg;
- break;
- case 't':
- test_config = 1;
- break;
- case 'T':
- test_readall = 1;
- global_option_set ("ReadThreads", "-1");
+ );
+
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case 'C':
+ configfile = optarg;
+ break;
+ case 't':
+ test_config = 1;
+ break;
+ case 'T':
+ test_readall = 1;
+ global_option_set("ReadThreads", "-1", 1);
#if COLLECT_DAEMON
- daemonize = 0;
+ daemonize = 0;
#endif /* COLLECT_DAEMON */
- break;
+ break;
#if COLLECT_DAEMON
- case 'P':
- global_option_set ("PIDFile", optarg);
- pidfile_from_cli = 1;
- break;
- case 'f':
- daemonize = 0;
- break;
+ case 'P':
+ global_option_set("PIDFile", optarg, 1);
+ break;
+ case 'f':
+ daemonize = 0;
+ break;
#endif /* COLLECT_DAEMON */
- case 'h':
- exit_usage (0);
- break;
- default:
- exit_usage (1);
- } /* switch (c) */
- } /* while (1) */
-
- if (optind < argc)
- exit_usage (1);
-
- plugin_init_ctx ();
-
- /*
- * Read options from the config file, the environment and the command
- * line (in that order, with later options overwriting previous ones in
- * general).
- * Also, this will automatically load modules.
- */
- if (cf_read (configfile))
- {
- fprintf (stderr, "Error: Reading the config file failed!\n"
- "Read the syslog for details.\n");
- return (1);
- }
-
- /*
- * Change directory. We do this _after_ reading the config and loading
- * modules to relative paths work as expected.
- */
- if ((basedir = global_option_get ("BaseDir")) == NULL)
- {
- fprintf (stderr, "Don't have a basedir to use. This should not happen. Ever.");
- return (1);
- }
- else if (change_basedir (basedir))
- {
- fprintf (stderr, "Error: Unable to change to directory `%s'.\n", basedir);
- return (1);
- }
-
- /*
- * Set global variables or, if that failes, exit. We cannot run with
- * them being uninitialized. If nothing is configured, then defaults
- * are being used. So this means that the user has actually done
- * something wrong.
- */
- if (init_global_variables () != 0)
- return (1);
-
- if (test_config)
- return (0);
+ case 'h':
+ exit_usage(0);
+ break;
+ default:
+ exit_usage(1);
+ } /* switch (c) */
+ } /* while (1) */
+
+ if (optind < argc)
+ exit_usage(1);
+
+ plugin_init_ctx();
+
+ /*
+ * Read options from the config file, the environment and the command
+ * line (in that order, with later options overwriting previous ones in
+ * general).
+ * Also, this will automatically load modules.
+ */
+ if (cf_read(configfile)) {
+ fprintf(stderr, "Error: Reading the config file failed!\n"
+ "Read the syslog for details.\n");
+ return (1);
+ }
+
+ /*
+ * Change directory. We do this _after_ reading the config and loading
+ * modules to relative paths work as expected.
+ */
+ if ((basedir = global_option_get("BaseDir")) == NULL) {
+ fprintf(stderr,
+ "Don't have a basedir to use. This should not happen. Ever.");
+ return (1);
+ } else if (change_basedir(basedir)) {
+ fprintf(stderr, "Error: Unable to change to directory `%s'.\n", basedir);
+ return (1);
+ }
+
+ /*
+ * Set global variables or, if that failes, exit. We cannot run with
+ * them being uninitialized. If nothing is configured, then defaults
+ * are being used. So this means that the user has actually done
+ * something wrong.
+ */
+ if (init_global_variables() != 0)
+ return (1);
+
+ if (test_config)
+ return (0);
#if COLLECT_DAEMON
- /*
- * fork off child
- */
- memset (&sig_chld_action, '\0', sizeof (sig_chld_action));
- sig_chld_action.sa_handler = SIG_IGN;
- sigaction (SIGCHLD, &sig_chld_action, NULL);
-
- /*
- * Only daemonize if we're not being supervised
- * by upstart or systemd (when using Linux).
- */
- if (daemonize
+ /*
+ * fork off child
+ */
+ struct sigaction sig_chld_action = {.sa_handler = SIG_IGN};
+
+ sigaction(SIGCHLD, &sig_chld_action, NULL);
+
+ /*
+ * Only daemonize if we're not being supervised
+ * by upstart or systemd (when using Linux).
+ */
+ if (daemonize
#ifdef KERNEL_LINUX
- && notify_upstart() == 0 && notify_systemd() == 0
+ && notify_upstart() == 0 && notify_systemd() == 0
#endif
- )
- {
- int status;
-
- if ((pid = fork ()) == -1)
- {
- /* error */
- char errbuf[1024];
- fprintf (stderr, "fork: %s",
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
- return (1);
- }
- else if (pid != 0)
- {
- /* parent */
- /* printf ("Running (PID %i)\n", pid); */
- return (0);
- }
-
- /* Detach from session */
- setsid ();
-
- /* Write pidfile */
- if (pidfile_create ())
- exit (2);
-
- /* close standard descriptors */
- close (2);
- close (1);
- close (0);
-
- status = open ("/dev/null", O_RDWR);
- if (status != 0)
- {
- ERROR ("Error: Could not connect `STDIN' to `/dev/null' (status %d)", status);
- return (1);
- }
-
- status = dup (0);
- if (status != 1)
- {
- ERROR ("Error: Could not connect `STDOUT' to `/dev/null' (status %d)", status);
- return (1);
- }
-
- status = dup (0);
- if (status != 2)
- {
- ERROR ("Error: Could not connect `STDERR' to `/dev/null', (status %d)", status);
- return (1);
- }
- } /* if (daemonize) */
+ ) {
+ int status;
+
+ if ((pid = fork()) == -1) {
+ /* error */
+ char errbuf[1024];
+ fprintf(stderr, "fork: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (1);
+ } else if (pid != 0) {
+ /* parent */
+ /* printf ("Running (PID %i)\n", pid); */
+ return (0);
+ }
+
+ /* Detach from session */
+ setsid();
+
+ /* Write pidfile */
+ if (pidfile_create())
+ exit(2);
+
+ /* close standard descriptors */
+ close(2);
+ close(1);
+ close(0);
+
+ status = open("/dev/null", O_RDWR);
+ if (status != 0) {
+ ERROR("Error: Could not connect `STDIN' to `/dev/null' (status %d)",
+ status);
+ return (1);
+ }
+
+ status = dup(0);
+ if (status != 1) {
+ ERROR("Error: Could not connect `STDOUT' to `/dev/null' (status %d)",
+ status);
+ return (1);
+ }
+
+ status = dup(0);
+ if (status != 2) {
+ ERROR("Error: Could not connect `STDERR' to `/dev/null', (status %d)",
+ status);
+ return (1);
+ }
+ } /* if (daemonize) */
#endif /* COLLECT_DAEMON */
- memset (&sig_pipe_action, '\0', sizeof (sig_pipe_action));
- sig_pipe_action.sa_handler = SIG_IGN;
- sigaction (SIGPIPE, &sig_pipe_action, NULL);
-
- /*
- * install signal handlers
- */
- memset (&sig_int_action, '\0', sizeof (sig_int_action));
- sig_int_action.sa_handler = sig_int_handler;
- if (0 != sigaction (SIGINT, &sig_int_action, NULL)) {
- char errbuf[1024];
- ERROR ("Error: Failed to install a signal handler for signal INT: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (1);
- }
-
- memset (&sig_term_action, '\0', sizeof (sig_term_action));
- sig_term_action.sa_handler = sig_term_handler;
- if (0 != sigaction (SIGTERM, &sig_term_action, NULL)) {
- char errbuf[1024];
- ERROR ("Error: Failed to install a signal handler for signal TERM: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (1);
- }
-
- memset (&sig_usr1_action, '\0', sizeof (sig_usr1_action));
- sig_usr1_action.sa_handler = sig_usr1_handler;
- if (0 != sigaction (SIGUSR1, &sig_usr1_action, NULL)) {
- char errbuf[1024];
- ERROR ("Error: Failed to install a signal handler for signal USR1: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- return (1);
- }
-
- /*
- * run the actual loops
- */
- if (do_init () != 0)
- {
- ERROR ("Error: one or more plugin init callbacks failed.");
- exit_status = 1;
- }
-
- if (test_readall)
- {
- if (plugin_read_all_once () != 0)
- {
- ERROR ("Error: one or more plugin read callbacks failed.");
- exit_status = 1;
- }
- }
- else
- {
- INFO ("Initialization complete, entering read-loop.");
- do_loop ();
- }
-
- /* close syslog */
- INFO ("Exiting normally.");
-
- if (do_shutdown () != 0)
- {
- ERROR ("Error: one or more plugin shutdown callbacks failed.");
- exit_status = 1;
- }
+ struct sigaction sig_pipe_action = {.sa_handler = SIG_IGN};
+
+ sigaction(SIGPIPE, &sig_pipe_action, NULL);
+
+ /*
+ * install signal handlers
+ */
+ struct sigaction sig_int_action = {.sa_handler = sig_int_handler};
+
+ if (0 != sigaction(SIGINT, &sig_int_action, NULL)) {
+ char errbuf[1024];
+ ERROR("Error: Failed to install a signal handler for signal INT: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (1);
+ }
+
+ struct sigaction sig_term_action = {.sa_handler = sig_term_handler};
+
+ if (0 != sigaction(SIGTERM, &sig_term_action, NULL)) {
+ char errbuf[1024];
+ ERROR("Error: Failed to install a signal handler for signal TERM: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (1);
+ }
+
+ struct sigaction sig_usr1_action = {.sa_handler = sig_usr1_handler};
+
+ if (0 != sigaction(SIGUSR1, &sig_usr1_action, NULL)) {
+ char errbuf[1024];
+ ERROR("Error: Failed to install a signal handler for signal USR1: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ return (1);
+ }
+
+ /*
+ * run the actual loops
+ */
+ if (do_init() != 0) {
+ ERROR("Error: one or more plugin init callbacks failed.");
+ exit_status = 1;
+ }
+
+ if (test_readall) {
+ if (plugin_read_all_once() != 0) {
+ ERROR("Error: one or more plugin read callbacks failed.");
+ exit_status = 1;
+ }
+ } else {
+ INFO("Initialization complete, entering read-loop.");
+ do_loop();
+ }
+
+ /* close syslog */
+ INFO("Exiting normally.");
+
+ if (do_shutdown() != 0) {
+ ERROR("Error: one or more plugin shutdown callbacks failed.");
+ exit_status = 1;
+ }
#if COLLECT_DAEMON
- if (daemonize)
- pidfile_remove ();
+ if (daemonize)
+ pidfile_remove();
#endif /* COLLECT_DAEMON */
- return (exit_status);
+ return (exit_status);
} /* int main */