projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.6' into collectd-5.7
[collectd.git]
/
src
/
exec.c
diff --git
a/src/exec.c
b/src/exec.c
index
c84c1c7
..
d34f9d9
100644
(file)
--- a/
src/exec.c
+++ b/
src/exec.c
@@
-250,7
+250,7
@@
static void set_environment(void) /* {{{ */
CDTIME_T_TO_DOUBLE(plugin_get_interval()));
setenv("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1);
CDTIME_T_TO_DOUBLE(plugin_get_interval()));
setenv("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1);
- ss
nprintf(buffer, sizeof(buffer), "%s", hostname_g
);
+ ss
trncpy(buffer, hostname_g, sizeof(buffer)
);
setenv("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1);
#else
ssnprintf(buffer, sizeof(buffer), "COLLECTD_INTERVAL=%.3f",
setenv("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1);
#else
ssnprintf(buffer, sizeof(buffer), "COLLECTD_INTERVAL=%.3f",
@@
-500,7
+500,7
@@
failed:
static int parse_line(char *buffer) /* {{{ */
{
if (strncasecmp("PUTVAL", buffer, strlen("PUTVAL")) == 0)
static int parse_line(char *buffer) /* {{{ */
{
if (strncasecmp("PUTVAL", buffer, strlen("PUTVAL")) == 0)
- return (handle_putval(stdout, buffer));
+ return (
cmd_
handle_putval(stdout, buffer));
else if (strncasecmp("PUTNOTIF", buffer, strlen("PUTNOTIF")) == 0)
return (handle_putnotif(stdout, buffer));
else {
else if (strncasecmp("PUTNOTIF", buffer, strlen("PUTNOTIF")) == 0)
return (handle_putnotif(stdout, buffer));
else {
@@
-787,7
+787,7
@@
static int exec_read(void) /* {{{ */
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- plugin_thread_create(&t, &attr, exec_read_one, (void *)pl);
+ plugin_thread_create(&t, &attr, exec_read_one, (void *)pl
, "exec read"
);
pthread_attr_destroy(&attr);
} /* for (pl) */
pthread_attr_destroy(&attr);
} /* for (pl) */
@@
-826,7
+826,8
@@
static int exec_notification(const notification_t *n, /* {{{ */
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- plugin_thread_create(&t, &attr, exec_notification_one, (void *)pln);
+ plugin_thread_create(&t, &attr, exec_notification_one, (void *)pln,
+ "exec notify");
pthread_attr_destroy(&attr);
} /* for (pl) */
pthread_attr_destroy(&attr);
} /* for (pl) */