X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=984ff757f3911fdc156717261bbb9c195907930a;hb=89783745dc59079eab34e0c52de6e5e972f50eb2;hp=e873adc2d5f58890ae2590fd9993732b6efa3a3a;hpb=838af4cdc6c8674ed3e14a95fea172118c707a85;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index e873adc2..984ff757 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -23,7 +23,10 @@ #include "collectd.h" #include "common.h" -#include "network.h" +#include +#include +#include + #include "plugin.h" #include "configfile.h" @@ -48,29 +51,71 @@ static void sigTermHandler (int signal) loop++; } -static int init_global_variables (void) +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); + } + + 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; + + 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) - str = COLLECTD_STEP; + str = "10"; interval_g = atoi (str); if (interval_g <= 0) { @@ -80,6 +125,10 @@ static int init_global_variables (void) } DEBUG ("interval_g = %i;", interval_g); + if (init_hostname () != 0) + return (-1); + DEBUG ("hostname_g = %s;", hostname_g); + return (0); } /* int init_global_variables */ @@ -91,7 +140,9 @@ static int change_basedir (const char *orig_dir) if (dir == NULL) { - ERROR ("strdup failed: %s", strerror (errno)); + char errbuf[1024]; + ERROR ("strdup failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -111,21 +162,27 @@ static int change_basedir (const char *orig_dir) { 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); } } @@ -162,7 +219,7 @@ static void update_kstat (void) /* 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" @@ -179,11 +236,6 @@ static void exit_usage (char *name) " 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 \n" "for contributions see `AUTHORS'\n"); @@ -227,7 +279,10 @@ static int do_loop (void) { 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; @@ -237,12 +292,14 @@ static int do_loop (void) #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); } @@ -258,7 +315,10 @@ static int do_loop (void) { if (errno != EINTR) { - ERROR ("nanosleep failed: %s", strerror (errno)); + char errbuf[1024]; + ERROR ("nanosleep failed: %s", + sstrerror (errno, errbuf, + sizeof (errbuf))); return (-1); } } @@ -282,7 +342,9 @@ static int pidfile_create (void) 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); } @@ -306,6 +368,7 @@ int main (int argc, char **argv) struct sigaction sigIntAction; struct sigaction sigTermAction; char *configfile = CONFIGFILE; + int test_config = 0; const char *basedir; #if COLLECT_DAEMON struct sigaction sigChldAction; @@ -318,7 +381,7 @@ int main (int argc, char **argv) { int c; - c = getopt (argc, argv, "hC:" + c = getopt (argc, argv, "htC:" #if COLLECT_DAEMON "fP:" #endif @@ -332,6 +395,9 @@ int main (int argc, char **argv) case 'C': configfile = optarg; break; + case 't': + test_config = 1; + break; #if COLLECT_DAEMON case 'P': global_option_set ("PIDFile", optarg); @@ -342,7 +408,7 @@ int main (int argc, char **argv) #endif /* COLLECT_DAEMON */ case 'h': default: - exit_usage (argv[0]); + exit_usage (); } /* switch (c) */ } /* while (1) */ @@ -383,6 +449,9 @@ int main (int argc, char **argv) if (init_global_variables () != 0) return (1); + if (test_config) + return (0); + #if COLLECT_DAEMON /* * fork off child @@ -396,7 +465,10 @@ int main (int argc, char **argv) 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)