#include "collectd.h"
#include "common.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+#include <pthread.h>
+
#include "plugin.h"
#include "configfile.h"
-#include "types_list.h"
/*
* Global variables
static int loop = 0;
+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 sigIntHandler (int signal)
{
loop++;
loop++;
}
-static int init_global_variables (void)
+static void sigUsr1Handler (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));
+ hostname_g[sizeof (hostname_g) - 1] = '\0';
+ 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);
}
- DEBUG ("hostname_g = %s;", hostname_g);
+
+ 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);
+ }
+
+ for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ {
+ if (ai_ptr->ai_canonname == NULL)
+ continue;
+
+ strncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
+ hostname_g[sizeof (hostname_g) - 1] = '\0';
+ 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)
}
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 (mkdir (orig_dir, 0755) == -1)
{
char errbuf[1024];
- ERROR ("mkdir (%s): %s", orig_dir,
+ ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
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"
}
#endif
- read_types_list ();
plugin_init_all ();
return (0);
#endif
/* Issue all plugins */
- plugin_read_all (&loop);
+ plugin_read_all ();
if (gettimeofday (&tv_now, NULL) < 0)
{
{
struct sigaction sigIntAction;
struct sigaction sigTermAction;
+ struct sigaction sigUsr1Action;
char *configfile = CONFIGFILE;
int test_config = 0;
const char *basedir;
#endif /* COLLECT_DAEMON */
case 'h':
default:
- exit_usage (argv[0]);
+ exit_usage ();
} /* switch (c) */
} /* while (1) */
sigTermAction.sa_handler = sigTermHandler;
sigaction (SIGTERM, &sigTermAction, NULL);
+ memset (&sigUsr1Action, '\0', sizeof (sigUsr1Action));
+ sigUsr1Action.sa_handler = sigUsr1Handler;
+ sigaction (SIGUSR1, &sigUsr1Action, NULL);
+
/*
* run the actual loops
*/