#include "common.h"
#include "plugin.h"
-#include "utils_cmd_putval.h"
#include "utils_cmd_putnotif.h"
+#include "utils_cmd_putval.h"
-#include <sys/types.h>
-#include <pwd.h>
#include <grp.h>
+#include <pwd.h>
#include <signal.h>
+#include <sys/types.h>
#ifdef HAVE_SYS_CAPABILITY_H
-# include <sys/capability.h>
+#include <sys/capability.h>
#endif
-#define PL_NORMAL 0x01
-#define PL_NOTIF_ACTION 0x02
+#define PL_NORMAL 0x01
+#define PL_NOTIF_ACTION 0x02
-#define PL_RUNNING 0x10
+#define PL_RUNNING 0x10
/*
* Private data types
*/
struct program_list_s;
typedef struct program_list_s program_list_t;
-struct program_list_s
-{
- char *user;
- char *group;
- char *exec;
- char **argv;
- int pid;
- int status;
- int flags;
+struct program_list_s {
+ char *user;
+ char *group;
+ char *exec;
+ char **argv;
+ int pid;
+ int status;
+ int flags;
program_list_t *next;
};
-typedef struct program_list_and_notification_s
-{
+typedef struct program_list_and_notification_s {
program_list_t *pl;
notification_t n;
} program_list_and_notification_t;
/*
* Functions
*/
-static void sigchld_handler (int __attribute__((unused)) signal) /* {{{ */
+static void sigchld_handler(int __attribute__((unused)) signal) /* {{{ */
{
pid_t pid;
int status;
- while ((pid = waitpid (-1, &status, WNOHANG)) > 0)
- {
+ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
program_list_t *pl;
for (pl = pl_head; pl != NULL; pl = pl->next)
if (pl->pid == pid)
} /* while (waitpid) */
} /* void sigchld_handler }}} */
-static int exec_config_exec (oconfig_item_t *ci) /* {{{ */
+static int exec_config_exec(oconfig_item_t *ci) /* {{{ */
{
program_list_t *pl;
char buffer[128];
int i;
- if (ci->children_num != 0)
- {
- WARNING ("exec plugin: The config option `%s' may not be a block.",
- ci->key);
+ if (ci->children_num != 0) {
+ WARNING("exec plugin: The config option `%s' may not be a block.", ci->key);
return (-1);
}
- if (ci->values_num < 2)
- {
- WARNING ("exec plugin: The config option `%s' needs at least two "
- "arguments.", ci->key);
+ if (ci->values_num < 2) {
+ WARNING("exec plugin: The config option `%s' needs at least two "
+ "arguments.",
+ ci->key);
return (-1);
}
- if ((ci->values[0].type != OCONFIG_TYPE_STRING)
- || (ci->values[1].type != OCONFIG_TYPE_STRING))
- {
- WARNING ("exec plugin: The first two arguments to the `%s' option must "
- "be string arguments.", ci->key);
+ if ((ci->values[0].type != OCONFIG_TYPE_STRING) ||
+ (ci->values[1].type != OCONFIG_TYPE_STRING)) {
+ WARNING("exec plugin: The first two arguments to the `%s' option must "
+ "be string arguments.",
+ ci->key);
return (-1);
}
- pl = calloc (1, sizeof (*pl));
- if (pl == NULL)
- {
- ERROR ("exec plugin: calloc failed.");
+ pl = calloc(1, sizeof(*pl));
+ if (pl == NULL) {
+ ERROR("exec plugin: calloc failed.");
return (-1);
}
- if (strcasecmp ("NotificationExec", ci->key) == 0)
+ if (strcasecmp("NotificationExec", ci->key) == 0)
pl->flags |= PL_NOTIF_ACTION;
else
pl->flags |= PL_NORMAL;
- pl->user = strdup (ci->values[0].value.string);
- if (pl->user == NULL)
- {
- ERROR ("exec plugin: strdup failed.");
- sfree (pl);
+ pl->user = strdup(ci->values[0].value.string);
+ if (pl->user == NULL) {
+ ERROR("exec plugin: strdup failed.");
+ sfree(pl);
return (-1);
}
- pl->group = strchr (pl->user, ':');
- if (pl->group != NULL)
- {
+ pl->group = strchr(pl->user, ':');
+ if (pl->group != NULL) {
*pl->group = '\0';
pl->group++;
}
- pl->exec = strdup (ci->values[1].value.string);
- if (pl->exec == NULL)
- {
- ERROR ("exec plugin: strdup failed.");
- sfree (pl->user);
- sfree (pl);
+ pl->exec = strdup(ci->values[1].value.string);
+ if (pl->exec == NULL) {
+ ERROR("exec plugin: strdup failed.");
+ sfree(pl->user);
+ sfree(pl);
return (-1);
}
- pl->argv = calloc (ci->values_num, sizeof (*pl->argv));
- if (pl->argv == NULL)
- {
- ERROR ("exec plugin: calloc failed.");
- sfree (pl->exec);
- sfree (pl->user);
- sfree (pl);
+ pl->argv = calloc(ci->values_num, sizeof(*pl->argv));
+ if (pl->argv == NULL) {
+ ERROR("exec plugin: calloc failed.");
+ sfree(pl->exec);
+ sfree(pl->user);
+ sfree(pl);
return (-1);
}
{
- char *tmp = strrchr (ci->values[1].value.string, '/');
+ char *tmp = strrchr(ci->values[1].value.string, '/');
if (tmp == NULL)
- sstrncpy (buffer, ci->values[1].value.string, sizeof (buffer));
+ sstrncpy(buffer, ci->values[1].value.string, sizeof(buffer));
else
- sstrncpy (buffer, tmp + 1, sizeof (buffer));
+ sstrncpy(buffer, tmp + 1, sizeof(buffer));
}
- pl->argv[0] = strdup (buffer);
- if (pl->argv[0] == NULL)
- {
- ERROR ("exec plugin: strdup failed.");
- sfree (pl->argv);
- sfree (pl->exec);
- sfree (pl->user);
- sfree (pl);
+ pl->argv[0] = strdup(buffer);
+ if (pl->argv[0] == NULL) {
+ ERROR("exec plugin: strdup failed.");
+ sfree(pl->argv);
+ sfree(pl->exec);
+ sfree(pl->user);
+ sfree(pl);
return (-1);
}
- for (i = 1; i < (ci->values_num - 1); i++)
- {
- if (ci->values[i + 1].type == OCONFIG_TYPE_STRING)
- {
- pl->argv[i] = strdup (ci->values[i + 1].value.string);
- }
- else
- {
- if (ci->values[i + 1].type == OCONFIG_TYPE_NUMBER)
- {
- ssnprintf (buffer, sizeof (buffer), "%lf",
- ci->values[i + 1].value.number);
- }
- else
- {
+ for (i = 1; i < (ci->values_num - 1); i++) {
+ if (ci->values[i + 1].type == OCONFIG_TYPE_STRING) {
+ pl->argv[i] = strdup(ci->values[i + 1].value.string);
+ } else {
+ if (ci->values[i + 1].type == OCONFIG_TYPE_NUMBER) {
+ ssnprintf(buffer, sizeof(buffer), "%lf",
+ ci->values[i + 1].value.number);
+ } else {
if (ci->values[i + 1].value.boolean)
- sstrncpy (buffer, "true", sizeof (buffer));
+ sstrncpy(buffer, "true", sizeof(buffer));
else
- sstrncpy (buffer, "false", sizeof (buffer));
+ sstrncpy(buffer, "false", sizeof(buffer));
}
- pl->argv[i] = strdup (buffer);
+ pl->argv[i] = strdup(buffer);
}
- if (pl->argv[i] == NULL)
- {
- ERROR ("exec plugin: strdup failed.");
+ if (pl->argv[i] == NULL) {
+ ERROR("exec plugin: strdup failed.");
break;
}
} /* for (i) */
- if (i < (ci->values_num - 1))
- {
- while ((--i) >= 0)
- {
- sfree (pl->argv[i]);
+ if (i < (ci->values_num - 1)) {
+ while ((--i) >= 0) {
+ sfree(pl->argv[i]);
}
- sfree (pl->argv);
- sfree (pl->exec);
- sfree (pl->user);
- sfree (pl);
+ sfree(pl->argv);
+ sfree(pl->exec);
+ sfree(pl->user);
+ sfree(pl);
return (-1);
}
- for (i = 0; pl->argv[i] != NULL; i++)
- {
- DEBUG ("exec plugin: argv[%i] = %s", i, pl->argv[i]);
+ for (i = 0; pl->argv[i] != NULL; i++) {
+ DEBUG("exec plugin: argv[%i] = %s", i, pl->argv[i]);
}
pl->next = pl_head;
return (0);
} /* int exec_config_exec }}} */
-static int exec_config (oconfig_item_t *ci) /* {{{ */
+static int exec_config(oconfig_item_t *ci) /* {{{ */
{
- for (int i = 0; i < ci->children_num; i++)
- {
+ for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
- if ((strcasecmp ("Exec", child->key) == 0)
- || (strcasecmp ("NotificationExec", child->key) == 0))
- exec_config_exec (child);
- else
- {
- WARNING ("exec plugin: Unknown config option `%s'.", child->key);
+ if ((strcasecmp("Exec", child->key) == 0) ||
+ (strcasecmp("NotificationExec", child->key) == 0))
+ exec_config_exec(child);
+ else {
+ WARNING("exec plugin: Unknown config option `%s'.", child->key);
}
} /* for (i) */
return (0);
} /* int exec_config }}} */
-static void set_environment (void) /* {{{ */
+static void set_environment(void) /* {{{ */
{
char buffer[1024];
#ifdef HAVE_SETENV
- ssnprintf (buffer, sizeof (buffer), "%.3f",
- CDTIME_T_TO_DOUBLE (plugin_get_interval ()));
- setenv ("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1);
+ ssnprintf(buffer, sizeof(buffer), "%.3f",
+ CDTIME_T_TO_DOUBLE(plugin_get_interval()));
+ setenv("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1);
- sstrncpy (buffer, hostname_g, sizeof (buffer));
- setenv ("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1);
+ sstrncpy(buffer, hostname_g, sizeof(buffer));
+ setenv("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1);
#else
- ssnprintf (buffer, sizeof (buffer), "COLLECTD_INTERVAL=%.3f",
- CDTIME_T_TO_DOUBLE (plugin_get_interval ()));
- putenv (buffer);
+ ssnprintf(buffer, sizeof(buffer), "COLLECTD_INTERVAL=%.3f",
+ CDTIME_T_TO_DOUBLE(plugin_get_interval()));
+ putenv(buffer);
- ssnprintf (buffer, sizeof (buffer), "COLLECTD_HOSTNAME=%s", hostname_g);
- putenv (buffer);
+ ssnprintf(buffer, sizeof(buffer), "COLLECTD_HOSTNAME=%s", hostname_g);
+ putenv(buffer);
#endif
} /* }}} void set_environment */
-__attribute__((noreturn))
-static void exec_child (program_list_t *pl, int uid, int gid, int egid) /* {{{ */
+__attribute__((noreturn)) static void exec_child(program_list_t *pl, int uid,
+ int gid, int egid) /* {{{ */
{
int status;
char errbuf[1024];
#if HAVE_SETGROUPS
- if (getuid () == 0)
- {
- gid_t glist[2];
+ if (getuid() == 0) {
+ gid_t glist[2];
size_t glist_len;
glist[0] = gid;
glist_len = 1;
- if ((gid != egid) && (egid != -1))
- {
+ if ((gid != egid) && (egid != -1)) {
glist[1] = egid;
glist_len = 2;
}
- setgroups (glist_len, glist);
+ setgroups(glist_len, glist);
}
#endif /* HAVE_SETGROUPS */
- status = setgid (gid);
- if (status != 0)
- {
- ERROR ("exec plugin: setgid (%i) failed: %s",
- gid, sstrerror (errno, errbuf, sizeof (errbuf)));
- exit (-1);
+ status = setgid(gid);
+ if (status != 0) {
+ ERROR("exec plugin: setgid (%i) failed: %s", gid,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ exit(-1);
}
- if (egid != -1)
- {
- status = setegid (egid);
- if (status != 0)
- {
- ERROR ("exec plugin: setegid (%i) failed: %s",
- egid, sstrerror (errno, errbuf, sizeof (errbuf)));
- exit (-1);
+ if (egid != -1) {
+ status = setegid(egid);
+ if (status != 0) {
+ ERROR("exec plugin: setegid (%i) failed: %s", egid,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ exit(-1);
}
}
- status = setuid (uid);
- if (status != 0)
- {
- ERROR ("exec plugin: setuid (%i) failed: %s",
- uid, sstrerror (errno, errbuf, sizeof (errbuf)));
- exit (-1);
+ status = setuid(uid);
+ if (status != 0) {
+ ERROR("exec plugin: setuid (%i) failed: %s", uid,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ exit(-1);
}
- execvp (pl->exec, pl->argv);
+ execvp(pl->exec, pl->argv);
- ERROR ("exec plugin: Failed to execute ``%s'': %s",
- pl->exec, sstrerror (errno, errbuf, sizeof (errbuf)));
- exit (-1);
+ ERROR("exec plugin: Failed to execute ``%s'': %s", pl->exec,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ exit(-1);
} /* void exec_child }}} */
-static void reset_signal_mask (void) /* {{{ */
+static void reset_signal_mask(void) /* {{{ */
{
sigset_t ss;
- sigemptyset (&ss);
- sigprocmask (SIG_SETMASK, &ss, /* old mask = */ NULL);
+ sigemptyset(&ss);
+ sigprocmask(SIG_SETMASK, &ss, /* old mask = */ NULL);
} /* }}} void reset_signal_mask */
-static int create_pipe (int fd_pipe[2]) /* {{{ */
+static int create_pipe(int fd_pipe[2]) /* {{{ */
{
char errbuf[1024];
int status;
- status = pipe (fd_pipe);
- if (status != 0)
- {
- ERROR ("exec plugin: pipe failed: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
+ status = pipe(fd_pipe);
+ if (status != 0) {
+ ERROR("exec plugin: pipe failed: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
return (-1);
}
return 0;
} /* }}} int create_pipe */
-static void close_pipe (int fd_pipe[2]) /* {{{ */
+static void close_pipe(int fd_pipe[2]) /* {{{ */
{
if (fd_pipe[0] != -1)
- close (fd_pipe[0]);
+ close(fd_pipe[0]);
if (fd_pipe[1] != -1)
- close (fd_pipe[1]);
+ close(fd_pipe[1]);
} /* }}} void close_pipe */
/*
* the child and fd_out is connected to STDOUT and fd_err is connected to STDERR
* of the child. Then is calls `exec_child'.
*/
-static int fork_child (program_list_t *pl, int *fd_in, int *fd_out, int *fd_err) /* {{{ */
+static int fork_child(program_list_t *pl, int *fd_in, int *fd_out,
+ int *fd_err) /* {{{ */
{
int fd_pipe_in[2] = {-1, -1};
int fd_pipe_out[2] = {-1, -1};
if (pl->pid != 0)
return (-1);
- if ((create_pipe(fd_pipe_in) == -1)
- || (create_pipe(fd_pipe_out) == -1)
- || (create_pipe(fd_pipe_err) == -1))
+ if ((create_pipe(fd_pipe_in) == -1) || (create_pipe(fd_pipe_out) == -1) ||
+ (create_pipe(fd_pipe_err) == -1))
goto failed;
sp_ptr = NULL;
- status = getpwnam_r (pl->user, &sp, nambuf, sizeof (nambuf), &sp_ptr);
- if (status != 0)
- {
- ERROR ("exec plugin: Failed to get user information for user ``%s'': %s",
- pl->user, sstrerror (errno, errbuf, sizeof (errbuf)));
+ status = getpwnam_r(pl->user, &sp, nambuf, sizeof(nambuf), &sp_ptr);
+ if (status != 0) {
+ ERROR("exec plugin: Failed to get user information for user ``%s'': %s",
+ pl->user, sstrerror(errno, errbuf, sizeof(errbuf)));
goto failed;
}
- if (sp_ptr == NULL)
- {
- ERROR ("exec plugin: No such user: `%s'", pl->user);
+ if (sp_ptr == NULL) {
+ ERROR("exec plugin: No such user: `%s'", pl->user);
goto failed;
}
uid = sp.pw_uid;
gid = sp.pw_gid;
- if (uid == 0)
- {
- ERROR ("exec plugin: Cowardly refusing to exec program as root.");
+ if (uid == 0) {
+ ERROR("exec plugin: Cowardly refusing to exec program as root.");
goto failed;
}
/* The group configured in the configfile is set as effective group, because
* this way the forked process can (re-)gain the user's primary group. */
egid = -1;
- if (NULL != pl->group)
- {
+ if (NULL != pl->group) {
if ('\0' != *pl->group) {
struct group *gr_ptr = NULL;
struct group gr;
- status = getgrnam_r (pl->group, &gr, nambuf, sizeof (nambuf), &gr_ptr);
- if (0 != status)
- {
- ERROR ("exec plugin: Failed to get group information "
- "for group ``%s'': %s", pl->group,
- sstrerror (errno, errbuf, sizeof (errbuf)));
+ status = getgrnam_r(pl->group, &gr, nambuf, sizeof(nambuf), &gr_ptr);
+ if (0 != status) {
+ ERROR("exec plugin: Failed to get group information "
+ "for group ``%s'': %s",
+ pl->group, sstrerror(errno, errbuf, sizeof(errbuf)));
goto failed;
}
- if (NULL == gr_ptr)
- {
- ERROR ("exec plugin: No such group: `%s'", pl->group);
+ if (NULL == gr_ptr) {
+ ERROR("exec plugin: No such group: `%s'", pl->group);
goto failed;
}
egid = gr.gr_gid;
- }
- else
- {
+ } else {
egid = gid;
}
} /* if (pl->group == NULL) */
- pid = fork ();
- if (pid < 0)
- {
- ERROR ("exec plugin: fork failed: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
+ pid = fork();
+ if (pid < 0) {
+ ERROR("exec plugin: fork failed: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
goto failed;
- }
- else if (pid == 0)
- {
+ } else if (pid == 0) {
int fd_num;
/* Close all file descriptors but the pipe end we need. */
- fd_num = getdtablesize ();
- for (int fd = 0; fd < fd_num; fd++)
- {
- if ((fd == fd_pipe_in[0])
- || (fd == fd_pipe_out[1])
- || (fd == fd_pipe_err[1]))
+ fd_num = getdtablesize();
+ for (int fd = 0; fd < fd_num; fd++) {
+ if ((fd == fd_pipe_in[0]) || (fd == fd_pipe_out[1]) ||
+ (fd == fd_pipe_err[1]))
continue;
- close (fd);
+ close(fd);
}
/* Connect the `in' pipe to STDIN */
- if (fd_pipe_in[0] != STDIN_FILENO)
- {
- dup2 (fd_pipe_in[0], STDIN_FILENO);
- close (fd_pipe_in[0]);
+ if (fd_pipe_in[0] != STDIN_FILENO) {
+ dup2(fd_pipe_in[0], STDIN_FILENO);
+ close(fd_pipe_in[0]);
}
/* Now connect the `out' pipe to STDOUT */
- if (fd_pipe_out[1] != STDOUT_FILENO)
- {
- dup2 (fd_pipe_out[1], STDOUT_FILENO);
- close (fd_pipe_out[1]);
+ if (fd_pipe_out[1] != STDOUT_FILENO) {
+ dup2(fd_pipe_out[1], STDOUT_FILENO);
+ close(fd_pipe_out[1]);
}
/* Now connect the `err' pipe to STDERR */
- if (fd_pipe_err[1] != STDERR_FILENO)
- {
- dup2 (fd_pipe_err[1], STDERR_FILENO);
- close (fd_pipe_err[1]);
+ if (fd_pipe_err[1] != STDERR_FILENO) {
+ dup2(fd_pipe_err[1], STDERR_FILENO);
+ close(fd_pipe_err[1]);
}
- set_environment ();
+ set_environment();
/* Unblock all signals */
- reset_signal_mask ();
+ reset_signal_mask();
- exec_child (pl, uid, gid, egid);
+ exec_child(pl, uid, gid, egid);
/* does not return */
}
- close (fd_pipe_in[0]);
- close (fd_pipe_out[1]);
- close (fd_pipe_err[1]);
+ close(fd_pipe_in[0]);
+ close(fd_pipe_out[1]);
+ close(fd_pipe_err[1]);
if (fd_in != NULL)
*fd_in = fd_pipe_in[1];
else
- close (fd_pipe_in[1]);
+ close(fd_pipe_in[1]);
if (fd_out != NULL)
*fd_out = fd_pipe_out[0];
else
- close (fd_pipe_out[0]);
+ close(fd_pipe_out[0]);
if (fd_err != NULL)
*fd_err = fd_pipe_err[0];
else
- close (fd_pipe_err[0]);
+ close(fd_pipe_err[0]);
return (pid);
return (-1);
} /* int fork_child }}} */
-static int parse_line (char *buffer) /* {{{ */
+static int parse_line(char *buffer) /* {{{ */
{
- if (strncasecmp ("PUTVAL", buffer, strlen ("PUTVAL")) == 0)
- return (cmd_handle_putval (stdout, buffer));
- else if (strncasecmp ("PUTNOTIF", buffer, strlen ("PUTNOTIF")) == 0)
- return (handle_putnotif (stdout, buffer));
- else
- {
- ERROR ("exec plugin: Unable to parse command, ignoring line: \"%s\"",
- buffer);
+ if (strncasecmp("PUTVAL", buffer, strlen("PUTVAL")) == 0)
+ return (cmd_handle_putval(stdout, buffer));
+ else if (strncasecmp("PUTNOTIF", buffer, strlen("PUTNOTIF")) == 0)
+ return (handle_putnotif(stdout, buffer));
+ else {
+ ERROR("exec plugin: Unable to parse command, ignoring line: \"%s\"",
+ buffer);
return (-1);
}
} /* int parse_line }}} */
-static void *exec_read_one (void *arg) /* {{{ */
+static void *exec_read_one(void *arg) /* {{{ */
{
- program_list_t *pl = (program_list_t *) arg;
+ program_list_t *pl = (program_list_t *)arg;
int fd, fd_err, highest_fd;
fd_set fdset, copy;
int status;
- char buffer[1200]; /* if not completely read */
+ char buffer[1200]; /* if not completely read */
char buffer_err[1024];
char *pbuffer = buffer;
char *pbuffer_err = buffer_err;
- status = fork_child (pl, NULL, &fd, &fd_err);
- if (status < 0)
- {
+ status = fork_child(pl, NULL, &fd, &fd_err);
+ if (status < 0) {
/* Reset the "running" flag */
- pthread_mutex_lock (&pl_lock);
+ pthread_mutex_lock(&pl_lock);
pl->flags &= ~PL_RUNNING;
- pthread_mutex_unlock (&pl_lock);
- pthread_exit ((void *) 1);
+ pthread_mutex_unlock(&pl_lock);
+ pthread_exit((void *)1);
}
pl->pid = status;
- assert (pl->pid != 0);
+ assert(pl->pid != 0);
- FD_ZERO( &fdset );
+ FD_ZERO(&fdset);
FD_SET(fd, &fdset);
FD_SET(fd_err, &fdset);
/* We use a copy of fdset, as select modifies it */
copy = fdset;
- while (1)
- {
+ while (1) {
int len;
- status = select (highest_fd + 1, ©, NULL, NULL, NULL);
- if (status < 0)
- {
+ status = select(highest_fd + 1, ©, NULL, NULL, NULL);
+ if (status < 0) {
if (errno == EINTR)
continue;
break;
}
- if (FD_ISSET(fd, ©))
- {
+ if (FD_ISSET(fd, ©)) {
char *pnl;
len = read(fd, pbuffer, sizeof(buffer) - 1 - (pbuffer - buffer));
- if (len < 0)
- {
- if (errno == EAGAIN || errno == EINTR) continue;
+ if (len < 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ continue;
break;
- }
- else if (len == 0) break; /* We've reached EOF */
+ } else if (len == 0)
+ break; /* We've reached EOF */
pbuffer[len] = '\0';
len += pbuffer - buffer;
pbuffer = buffer;
- while ((pnl = strchr(pbuffer, '\n')))
- {
+ while ((pnl = strchr(pbuffer, '\n'))) {
*pnl = '\0';
- if (*(pnl-1) == '\r' ) *(pnl-1) = '\0';
+ if (*(pnl - 1) == '\r')
+ *(pnl - 1) = '\0';
- parse_line (pbuffer);
+ parse_line(pbuffer);
pbuffer = ++pnl;
}
/* not completely read ? */
- if (pbuffer - buffer < len)
- {
+ if (pbuffer - buffer < len) {
len -= pbuffer - buffer;
memmove(buffer, pbuffer, len);
pbuffer = buffer + len;
- }
- else
+ } else
pbuffer = buffer;
- }
- else if (FD_ISSET(fd_err, ©))
- {
+ } else if (FD_ISSET(fd_err, ©)) {
char *pnl;
- len = read(fd_err, pbuffer_err, sizeof(buffer_err) - 1 - (pbuffer_err - buffer_err));
+ len = read(fd_err, pbuffer_err,
+ sizeof(buffer_err) - 1 - (pbuffer_err - buffer_err));
- if (len < 0)
- {
+ if (len < 0) {
if (errno == EAGAIN || errno == EINTR)
continue;
break;
- }
- else if (len == 0)
- {
+ } else if (len == 0) {
/* We've reached EOF */
- NOTICE ("exec plugin: Program `%s' has closed STDERR.", pl->exec);
+ NOTICE("exec plugin: Program `%s' has closed STDERR.", pl->exec);
/* Remove file descriptor form select() set. */
- FD_CLR (fd_err, &fdset);
+ FD_CLR(fd_err, &fdset);
copy = fdset;
highest_fd = fd;
/* Clean up file descriptor */
- close (fd_err);
+ close(fd_err);
fd_err = -1;
continue;
}
len += pbuffer_err - buffer_err;
pbuffer_err = buffer_err;
- while ((pnl = strchr(pbuffer_err, '\n')))
- {
+ while ((pnl = strchr(pbuffer_err, '\n'))) {
*pnl = '\0';
- if (*(pnl-1) == '\r' ) *(pnl-1) = '\0';
+ if (*(pnl - 1) == '\r')
+ *(pnl - 1) = '\0';
- ERROR ("exec plugin: exec_read_one: error = %s", pbuffer_err);
+ ERROR("exec plugin: exec_read_one: error = %s", pbuffer_err);
pbuffer_err = ++pnl;
}
/* not completely read ? */
- if (pbuffer_err - buffer_err < len)
- {
+ if (pbuffer_err - buffer_err < len) {
len -= pbuffer_err - buffer_err;
memmove(buffer_err, pbuffer_err, len);
pbuffer_err = buffer_err + len;
- }
- else
+ } else
pbuffer_err = buffer_err;
}
/* reset copy */
copy = fdset;
}
- DEBUG ("exec plugin: exec_read_one: Waiting for `%s' to exit.", pl->exec);
- if (waitpid (pl->pid, &status, 0) > 0)
+ DEBUG("exec plugin: exec_read_one: Waiting for `%s' to exit.", pl->exec);
+ if (waitpid(pl->pid, &status, 0) > 0)
pl->status = status;
- DEBUG ("exec plugin: Child %i exited with status %i.",
- (int) pl->pid, pl->status);
+ DEBUG("exec plugin: Child %i exited with status %i.", (int)pl->pid,
+ pl->status);
pl->pid = 0;
- pthread_mutex_lock (&pl_lock);
+ pthread_mutex_lock(&pl_lock);
pl->flags &= ~PL_RUNNING;
- pthread_mutex_unlock (&pl_lock);
+ pthread_mutex_unlock(&pl_lock);
- close (fd);
+ close(fd);
if (fd_err >= 0)
- close (fd_err);
+ close(fd_err);
- pthread_exit ((void *) 0);
+ pthread_exit((void *)0);
return (NULL);
} /* void *exec_read_one }}} */
-static void *exec_notification_one (void *arg) /* {{{ */
+static void *exec_notification_one(void *arg) /* {{{ */
{
- program_list_t *pl = ((program_list_and_notification_t *) arg)->pl;
- notification_t *n = &((program_list_and_notification_t *) arg)->n;
+ program_list_t *pl = ((program_list_and_notification_t *)arg)->pl;
+ notification_t *n = &((program_list_and_notification_t *)arg)->n;
int fd;
FILE *fh;
int pid;
int status;
const char *severity;
- pid = fork_child (pl, &fd, NULL, NULL);
+ pid = fork_child(pl, &fd, NULL, NULL);
if (pid < 0) {
- sfree (arg);
- pthread_exit ((void *) 1);
+ sfree(arg);
+ pthread_exit((void *)1);
}
- fh = fdopen (fd, "w");
- if (fh == NULL)
- {
+ fh = fdopen(fd, "w");
+ if (fh == NULL) {
char errbuf[1024];
- ERROR ("exec plugin: fdopen (%i) failed: %s", fd,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- kill (pid, SIGTERM);
- close (fd);
- sfree (arg);
- pthread_exit ((void *) 1);
+ ERROR("exec plugin: fdopen (%i) failed: %s", fd,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ kill(pid, SIGTERM);
+ close(fd);
+ sfree(arg);
+ pthread_exit((void *)1);
}
severity = "FAILURE";
else if (n->severity == NOTIF_OKAY)
severity = "OKAY";
- fprintf (fh,
- "Severity: %s\n"
- "Time: %.3f\n",
- severity, CDTIME_T_TO_DOUBLE (n->time));
+ fprintf(fh, "Severity: %s\n"
+ "Time: %.3f\n",
+ severity, CDTIME_T_TO_DOUBLE(n->time));
/* Print the optional fields */
- if (strlen (n->host) > 0)
- fprintf (fh, "Host: %s\n", n->host);
- if (strlen (n->plugin) > 0)
- fprintf (fh, "Plugin: %s\n", n->plugin);
- if (strlen (n->plugin_instance) > 0)
- fprintf (fh, "PluginInstance: %s\n", n->plugin_instance);
- if (strlen (n->type) > 0)
- fprintf (fh, "Type: %s\n", n->type);
- if (strlen (n->type_instance) > 0)
- fprintf (fh, "TypeInstance: %s\n", n->type_instance);
-
- for (notification_meta_t *meta = n->meta; meta != NULL; meta = meta->next)
- {
+ if (strlen(n->host) > 0)
+ fprintf(fh, "Host: %s\n", n->host);
+ if (strlen(n->plugin) > 0)
+ fprintf(fh, "Plugin: %s\n", n->plugin);
+ if (strlen(n->plugin_instance) > 0)
+ fprintf(fh, "PluginInstance: %s\n", n->plugin_instance);
+ if (strlen(n->type) > 0)
+ fprintf(fh, "Type: %s\n", n->type);
+ if (strlen(n->type_instance) > 0)
+ fprintf(fh, "TypeInstance: %s\n", n->type_instance);
+
+ for (notification_meta_t *meta = n->meta; meta != NULL; meta = meta->next) {
if (meta->type == NM_TYPE_STRING)
- fprintf (fh, "%s: %s\n", meta->name, meta->nm_value.nm_string);
+ fprintf(fh, "%s: %s\n", meta->name, meta->nm_value.nm_string);
else if (meta->type == NM_TYPE_SIGNED_INT)
- fprintf (fh, "%s: %"PRIi64"\n", meta->name, meta->nm_value.nm_signed_int);
+ fprintf(fh, "%s: %" PRIi64 "\n", meta->name,
+ meta->nm_value.nm_signed_int);
else if (meta->type == NM_TYPE_UNSIGNED_INT)
- fprintf (fh, "%s: %"PRIu64"\n", meta->name, meta->nm_value.nm_unsigned_int);
+ fprintf(fh, "%s: %" PRIu64 "\n", meta->name,
+ meta->nm_value.nm_unsigned_int);
else if (meta->type == NM_TYPE_DOUBLE)
- fprintf (fh, "%s: %e\n", meta->name, meta->nm_value.nm_double);
+ fprintf(fh, "%s: %e\n", meta->name, meta->nm_value.nm_double);
else if (meta->type == NM_TYPE_BOOLEAN)
- fprintf (fh, "%s: %s\n", meta->name,
- meta->nm_value.nm_boolean ? "true" : "false");
+ fprintf(fh, "%s: %s\n", meta->name,
+ meta->nm_value.nm_boolean ? "true" : "false");
}
- fprintf (fh, "\n%s\n", n->message);
+ fprintf(fh, "\n%s\n", n->message);
- fflush (fh);
- fclose (fh);
+ fflush(fh);
+ fclose(fh);
- waitpid (pid, &status, 0);
+ waitpid(pid, &status, 0);
- DEBUG ("exec plugin: Child %i exited with status %i.",
- pid, status);
+ DEBUG("exec plugin: Child %i exited with status %i.", pid, status);
if (n->meta != NULL)
- plugin_notification_meta_free (n->meta);
+ plugin_notification_meta_free(n->meta);
n->meta = NULL;
- sfree (arg);
- pthread_exit ((void *) 0);
+ sfree(arg);
+ pthread_exit((void *)0);
return (NULL);
} /* void *exec_notification_one }}} */
-static int exec_init (void) /* {{{ */
+static int exec_init(void) /* {{{ */
{
- struct sigaction sa = {
- .sa_handler = sigchld_handler
- };
+ struct sigaction sa = {.sa_handler = sigchld_handler};
- sigaction (SIGCHLD, &sa, NULL);
+ sigaction(SIGCHLD, &sa, NULL);
#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_SETUID) && defined(CAP_SETGID)
- if ((check_capability (CAP_SETUID) != 0) ||
- (check_capability (CAP_SETGID) != 0))
- {
- if (getuid () == 0)
- WARNING ("exec plugin: Running collectd as root, but the CAP_SETUID "
+ if ((check_capability(CAP_SETUID) != 0) ||
+ (check_capability(CAP_SETGID) != 0)) {
+ if (getuid() == 0)
+ WARNING(
+ "exec plugin: Running collectd as root, but the CAP_SETUID "
"or CAP_SETGID capabilities are missing. The plugin's read function "
"will probably fail. Is your init system dropping capabilities?");
else
- WARNING ("exec plugin: collectd doesn't have the CAP_SETUID or "
+ WARNING(
+ "exec plugin: collectd doesn't have the CAP_SETUID or "
"CAP_SETGID capabilities. If you don't want to run collectd as root, "
"try running \"setcap 'cap_setuid=ep cap_setgid=ep'\" on the "
"collectd binary.");
return (0);
} /* int exec_init }}} */
-static int exec_read (void) /* {{{ */
+static int exec_read(void) /* {{{ */
{
- for (program_list_t *pl = pl_head; pl != NULL; pl = pl->next)
- {
+ for (program_list_t *pl = pl_head; pl != NULL; pl = pl->next) {
pthread_t t;
pthread_attr_t attr;
if ((pl->flags & PL_NORMAL) == 0)
continue;
- pthread_mutex_lock (&pl_lock);
+ pthread_mutex_lock(&pl_lock);
/* Skip if a child is already running. */
- if ((pl->flags & PL_RUNNING) != 0)
- {
- pthread_mutex_unlock (&pl_lock);
+ if ((pl->flags & PL_RUNNING) != 0) {
+ pthread_mutex_unlock(&pl_lock);
continue;
}
pl->flags |= PL_RUNNING;
- pthread_mutex_unlock (&pl_lock);
+ pthread_mutex_unlock(&pl_lock);
- pthread_attr_init (&attr);
- pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
- plugin_thread_create (&t, &attr, exec_read_one, (void *) pl, "exec read");
- pthread_attr_destroy (&attr);
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ plugin_thread_create(&t, &attr, exec_read_one, (void *)pl, "exec read");
+ pthread_attr_destroy(&attr);
} /* for (pl) */
return (0);
} /* int exec_read }}} */
-static int exec_notification (const notification_t *n, /* {{{ */
- user_data_t __attribute__((unused)) *user_data)
-{
+static int exec_notification(const notification_t *n, /* {{{ */
+ user_data_t __attribute__((unused)) * user_data) {
program_list_and_notification_t *pln;
- for (program_list_t *pl = pl_head; pl != NULL; pl = pl->next)
- {
+ for (program_list_t *pl = pl_head; pl != NULL; pl = pl->next) {
pthread_t t;
pthread_attr_t attr;
if (pl->pid != 0)
continue;
- pln = malloc (sizeof (*pln));
- if (pln == NULL)
- {
- ERROR ("exec plugin: malloc failed.");
+ pln = malloc(sizeof(*pln));
+ if (pln == NULL) {
+ ERROR("exec plugin: malloc failed.");
continue;
}
pln->pl = pl;
- memcpy (&pln->n, n, sizeof (notification_t));
+ memcpy(&pln->n, n, sizeof(notification_t));
/* Set the `meta' member to NULL, otherwise `plugin_notification_meta_copy'
* will run into an endless loop. */
pln->n.meta = NULL;
- plugin_notification_meta_copy (&pln->n, n);
+ plugin_notification_meta_copy(&pln->n, n);
- pthread_attr_init (&attr);
- pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
- plugin_thread_create (&t, &attr, exec_notification_one, (void *) pln,
- "exec notify");
- pthread_attr_destroy (&attr);
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ plugin_thread_create(&t, &attr, exec_notification_one, (void *)pln,
+ "exec notify");
+ pthread_attr_destroy(&attr);
} /* for (pl) */
return (0);
} /* }}} int exec_notification */
-static int exec_shutdown (void) /* {{{ */
+static int exec_shutdown(void) /* {{{ */
{
program_list_t *pl;
program_list_t *next;
pl = pl_head;
- while (pl != NULL)
- {
+ while (pl != NULL) {
next = pl->next;
- if (pl->pid > 0)
- {
- kill (pl->pid, SIGTERM);
- INFO ("exec plugin: Sent SIGTERM to %hu", (unsigned short int) pl->pid);
+ if (pl->pid > 0) {
+ kill(pl->pid, SIGTERM);
+ INFO("exec plugin: Sent SIGTERM to %hu", (unsigned short int)pl->pid);
}
- sfree (pl->user);
- sfree (pl);
+ sfree(pl->user);
+ sfree(pl);
pl = next;
} /* while (pl) */
return (0);
} /* int exec_shutdown }}} */
-void module_register (void)
-{
- plugin_register_complex_config ("exec", exec_config);
- plugin_register_init ("exec", exec_init);
- plugin_register_read ("exec", exec_read);
- plugin_register_notification ("exec", exec_notification,
- /* user_data = */ NULL);
- plugin_register_shutdown ("exec", exec_shutdown);
+void module_register(void) {
+ plugin_register_complex_config("exec", exec_config);
+ plugin_register_init("exec", exec_init);
+ plugin_register_read("exec", exec_read);
+ plugin_register_notification("exec", exec_notification,
+ /* user_data = */ NULL);
+ plugin_register_shutdown("exec", exec_shutdown);
} /* void module_register */
/*
projects / collectd.git / blobdiff