X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=727876bc2f0fd4fb11caa245c226cb42e25f4bdf;hp=dd9b12f85669cfc2e490320308b3bd3b0adaf37e;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=c8917bfd81e4b7d330d5113af669c739ade6b02b diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index dd9b12f8..727876bc 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -43,6 +43,10 @@ #include #endif +#if HAVE_KSTAT_H +#include +#endif + #ifndef COLLECTD_LOCALE #define COLLECTD_LOCALE "C" #endif @@ -76,10 +80,11 @@ static void sig_usr1_handler(int __attribute__((unused)) signal) { } static int init_hostname(void) { - const char *str; - - struct addrinfo *ai_list; - int status; + const char *str = global_option_get("Hostname"); + if ((str != NULL) && (str[0] != 0)) { + hostname_set(str); + return 0; + } long hostname_len = sysconf(_SC_HOST_NAME_MAX); if (hostname_len == -1) { @@ -87,25 +92,22 @@ static int init_hostname(void) { } char hostname[hostname_len]; - str = global_option_get("Hostname"); - if ((str != NULL) && (str[0] != 0)) { - hostname_set(str); - return 0; - } - if (gethostname(hostname, hostname_len) != 0) { fprintf(stderr, "`gethostname' failed and no " "hostname was configured.\n"); return -1; } + hostname_set(hostname); + str = global_option_get("FQDNLookup"); if (IS_FALSE(str)) return 0; + struct addrinfo *ai_list; struct addrinfo ai_hints = {.ai_flags = AI_CANONNAME}; - status = getaddrinfo(hostname, NULL, &ai_hints, &ai_list); + int status = getaddrinfo(hostname, NULL, &ai_hints, &ai_list); if (status != 0) { ERROR("Looking up \"%s\" failed. You have set the " "\"FQDNLookup\" option, but I cannot resolve " @@ -161,8 +163,7 @@ static int change_basedir(const char *orig_dir, _Bool create) { dir = strdup(orig_dir); if (dir == NULL) { - char errbuf[1024]; - ERROR("strdup failed: %s", sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("strdup failed: %s", STRERRNO); return -1; } @@ -180,27 +181,21 @@ static int change_basedir(const char *orig_dir, _Bool create) { free(dir); return 0; } else if (!create || (errno != ENOENT)) { - char errbuf[1024]; - ERROR("change_basedir: chdir (%s): %s", dir, - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("change_basedir: chdir (%s): %s", dir, STRERRNO); 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))); + ERROR("change_basedir: mkdir (%s): %s", dir, STRERRNO); 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))); + ERROR("change_basedir: chdir (%s): %s", dir, STRERRNO); free(dir); return -1; } @@ -210,6 +205,7 @@ static int change_basedir(const char *orig_dir, _Bool create) { } /* static int change_basedir (char *dir) */ #if HAVE_LIBKSTAT +extern kstat_ctl_t *kc; static void update_kstat(void) { if (kc == NULL) { if ((kc = kstat_open()) == NULL) @@ -324,8 +320,7 @@ static int do_loop(void) { while ((loop == 0) && (nanosleep(&ts_wait, &ts_wait) != 0)) { if (errno != EINTR) { - char errbuf[1024]; - ERROR("nanosleep failed: %s", sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("nanosleep failed: %s", STRERRNO); return -1; } } @@ -344,8 +339,7 @@ static int pidfile_create(void) { 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))); + ERROR("fopen (%s): %s", file, STRERRNO); return 1; } @@ -378,7 +372,7 @@ static int notify_upstart(void) { return 0; } - NOTICE("Upstart detected, stopping now to signal readyness."); + NOTICE("Upstart detected, stopping now to signal readiness."); raise(SIGSTOP); unsetenv("UPSTART_JOB"); @@ -403,7 +397,7 @@ static int notify_systemd(void) { notifysocket); return 0; } - NOTICE("Systemd detected, trying to signal readyness."); + NOTICE("Systemd detected, trying to signal readiness."); unsetenv("NOTIFY_SOCKET"); @@ -413,9 +407,7 @@ static int notify_systemd(void) { 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))); + ERROR("creating UNIX socket failed: %s", STRERRNO); return 0; } @@ -438,9 +430,7 @@ static int notify_systemd(void) { 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))); + ERROR("sendto(\"%s\") failed: %s", notifysocket, STRERRNO); close(fd); return 0; } @@ -590,8 +580,7 @@ int main(int argc, char **argv) { if ((pid = fork()) == -1) { /* error */ - char errbuf[1024]; - fprintf(stderr, "fork: %s", sstrerror(errno, errbuf, sizeof(errbuf))); + fprintf(stderr, "fork: %s", STRERRNO); return 1; } else if (pid != 0) { /* parent */ @@ -644,27 +633,24 @@ int main(int argc, char **argv) { 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))); + STRERRNO); 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))); + STRERRNO); 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))); + STRERRNO); return 1; }