From: Ruben Kerkhof Date: Tue, 1 Mar 2016 11:47:25 +0000 (+0100) Subject: Merge branch 'collectd-5.5' X-Git-Tag: collectd-5.6.0~460 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b24fe01f603e1422de29c2cf090eabb043df1965;p=collectd.git Merge branch 'collectd-5.5' --- b24fe01f603e1422de29c2cf090eabb043df1965 diff --cc src/daemon/collectd.c index 7b324e1e,6e625bbb..a745d7d1 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@@ -422,9 -423,9 +422,9 @@@ static int pidfile_remove (void #endif /* COLLECT_DAEMON */ #ifdef KERNEL_LINUX - int notify_upstart (void) + static int notify_upstart (void) { - const char *upstart_job = getenv("UPSTART_JOB"); + char const *upstart_job = getenv("UPSTART_JOB"); if (upstart_job == NULL) return 0; @@@ -442,15 -440,14 +442,15 @@@ return 1; } - int notify_systemd (void) + static int notify_systemd (void) { - int fd = -1; - const char *notifysocket = getenv("NOTIFY_SOCKET"); + int fd; + const char *notifysocket; struct sockaddr_un su; - struct iovec iov; - struct msghdr hdr; + size_t su_size; + char buffer[] = "READY=1\n"; + notifysocket = getenv ("NOTIFY_SOCKET"); if (notifysocket == NULL) return 0; diff --cc src/write_riemann.c index 5c59c92e,58611a96..6a47ba32 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@@ -26,6 -26,13 +26,12 @@@ * Florian octo Forster */ -#include + #include + #include + #include + #include + #include + #include "collectd.h" #include "plugin.h" #include "common.h"