#include "collectd.h"
#include "common.h"
-#include "network.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+#include <pthread.h>
+
#include "plugin.h"
#include "configfile.h"
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
/*
* Global variables
*/
static int loop = 0;
-static void sigIntHandler (int signal)
+static void *do_flush (void *arg)
+{
+ INFO ("Flushing all data.");
+ plugin_flush_all (-1);
+ INFO ("Finished flushing all data.");
+ pthread_exit (NULL);
+ return NULL;
+}
+
+static void sig_int_handler (int signal)
{
loop++;
}
-static void sigTermHandler (int signal)
+static void sig_term_handler (int signal)
{
loop++;
}
-static int init_global_variables (void)
+static void sig_usr1_handler (int 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);
+}
+
+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)
{
- strncpy (hostname_g, str, sizeof (hostname_g));
+ sstrncpy (hostname_g, str, sizeof (hostname_g));
+ return (0);
}
- else
+
+ if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
{
- if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
- {
- fprintf (stderr, "`gethostname' failed and no "
- "hostname was configured.\n");
- return (-1);
- }
+ fprintf (stderr, "`gethostname' failed and no "
+ "hostname was configured.\n");
+ return (-1);
+ }
+
+ str = global_option_get ("FQDNLookup");
+ if ((strcasecmp ("false", str) == 0)
+ || (strcasecmp ("no", str) == 0)
+ || (strcasecmp ("off", str) == 0))
+ 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 you network "
+ "configuration.", hostname_g);
+ return (-1);
}
- DEBUG ("hostname_g = %s;", hostname_g);
+
+ 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);
+} /* int init_hostname */
+
+static int init_global_variables (void)
+{
+ const char *str;
str = global_option_get ("Interval");
if (str == NULL)
- str = COLLECTD_STEP;
+ str = "10";
interval_g = atoi (str);
if (interval_g <= 0)
{
}
DEBUG ("interval_g = %i;", interval_g);
+ if (init_hostname () != 0)
+ return (-1);
+ DEBUG ("hostname_g = %s;", hostname_g);
+
return (0);
} /* int init_global_variables */
if (dir == NULL)
{
- ERROR ("strdup failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("strdup failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
{
if (mkdir (orig_dir, 0755) == -1)
{
- ERROR ("mkdir (%s): %s", orig_dir,
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
else if (chdir (orig_dir) == -1)
{
+ char errbuf[1024];
ERROR ("chdir (%s): %s", orig_dir,
- strerror (errno));
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
else
{
+ char errbuf[1024];
ERROR ("chdir (%s): %s", orig_dir,
- strerror (errno));
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
/* TODO
* Remove all settings but `-f' and `-C'
*/
-static void exit_usage (char *name)
+static void exit_usage (void)
{
printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
" General:\n"
" -C <file> Configuration file.\n"
" Default: "CONFIGFILE"\n"
+ " -t Test config and exit.\n"
" -P <file> PID-file.\n"
" Default: "PIDFILE"\n"
#if COLLECT_DAEMON
" -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"
" Data-Directory "PKGLOCALSTATEDIR"\n"
-#if COLLECT_DEBUG
- " Log-File "LOGFILE"\n"
-#endif
- " Step "COLLECTD_STEP" seconds\n"
- " Heartbeat "COLLECTD_HEARTBEAT" seconds\n"
"\n"PACKAGE" "VERSION", http://collectd.org/\n"
"by Florian octo Forster <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");
{
if (gettimeofday (&tv_next, NULL) < 0)
{
- ERROR ("gettimeofday failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
tv_next.tv_sec += interval_g;
#endif
/* Issue all plugins */
- plugin_read_all (&loop);
+ plugin_read_all ();
if (gettimeofday (&tv_now, NULL) < 0)
{
+ char errbuf[1024];
ERROR ("gettimeofday failed: %s",
- strerror (errno));
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
{
if (errno != EINTR)
{
- ERROR ("nanosleep failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("nanosleep failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
if ((fh = fopen (file, "w")) == NULL)
{
- ERROR ("fopen (%s): %s", file, strerror (errno));
+ char errbuf[1024];
+ ERROR ("fopen (%s): %s", file,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (1);
}
int main (int argc, char **argv)
{
- struct sigaction sigIntAction;
- struct sigaction sigTermAction;
+ struct sigaction sig_int_action;
+ struct sigaction sig_term_action;
+ struct sigaction sig_usr1_action;
+ struct sigaction sig_pipe_action;
char *configfile = CONFIGFILE;
+ int test_config = 0;
const char *basedir;
#if COLLECT_DAEMON
- struct sigaction sigChldAction;
+ struct sigaction sig_chld_action;
pid_t pid;
int daemonize = 1;
#endif
{
int c;
- c = getopt (argc, argv, "hC:"
+ c = getopt (argc, argv, "htC:"
#if COLLECT_DAEMON
"fP:"
#endif
case 'C':
configfile = optarg;
break;
+ case 't':
+ test_config = 1;
+ break;
#if COLLECT_DAEMON
case 'P':
global_option_set ("PIDFile", optarg);
#endif /* COLLECT_DAEMON */
case 'h':
default:
- exit_usage (argv[0]);
+ exit_usage ();
} /* switch (c) */
} /* while (1) */
if (init_global_variables () != 0)
return (1);
+ if (test_config)
+ return (0);
+
#if COLLECT_DAEMON
/*
* fork off child
*/
- memset (&sigChldAction, '\0', sizeof (sigChldAction));
- sigChldAction.sa_handler = SIG_IGN;
- sigaction (SIGCHLD, &sigChldAction, NULL);
+ memset (&sig_chld_action, '\0', sizeof (sig_chld_action));
+ sig_chld_action.sa_handler = SIG_IGN;
+ sigaction (SIGCHLD, &sig_chld_action, NULL);
if (daemonize)
{
if ((pid = fork ()) == -1)
{
/* error */
- fprintf (stderr, "fork: %s", strerror (errno));
+ char errbuf[1024];
+ fprintf (stderr, "fork: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (1);
}
else if (pid != 0)
} /* 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 (&sigIntAction, '\0', sizeof (sigIntAction));
- sigIntAction.sa_handler = sigIntHandler;
- sigaction (SIGINT, &sigIntAction, NULL);
+ 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 (&sigTermAction, '\0', sizeof (sigTermAction));
- sigTermAction.sa_handler = sigTermHandler;
- sigaction (SIGTERM, &sigTermAction, NULL);
+ 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
projects / collectd.git / blobdiff