X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fexec.c;h=c64f949fc57b4ac5cff424a6b27e7cd283e13184;hb=37e18082cfb22491138e282074c5267df48dd8de;hp=e60065834e3ba1f0fc123cbbe1c5a89907db2d6f;hpb=40783e8982dd86f65dcf67df44992097719a995b;p=collectd.git diff --git a/src/exec.c b/src/exec.c index e6006583..c64f949f 100644 --- a/src/exec.c +++ b/src/exec.c @@ -265,6 +265,29 @@ static int exec_config (oconfig_item_t *ci) /* {{{ */ return (0); } /* int exec_config }}} */ +static void set_environment (void) /* {{{ */ +{ + char buffer[1024]; + +#ifdef HAVE_SETENV + ssnprintf (buffer, sizeof (buffer), "%i", interval_g); + setenv ("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1); + + ssnprintf (buffer, sizeof (buffer), "%s", hostname_g); + setenv ("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1); +#else + ssnprintf (buffer, sizeof (buffer), "COLLECTD_INTERVAL=%i", interval_g); + putenv (buffer); + + ssnprintf (buffer, sizeof (buffer), "COLLECTD_HOSTNAME=%s", hostname_g); + putenv (buffer); +#endif + +#ifdef HAVE_SETENV +#else +#endif +} /* }}} void set_environment */ + __attribute__((noreturn)) static void exec_child (program_list_t *pl) /* {{{ */ { @@ -479,6 +502,8 @@ static int fork_child (program_list_t *pl, int *fd_in, int *fd_out, int *fd_err) close (fd_pipe_err[1]); } + set_environment (); + /* Unblock all signals */ reset_signal_mask ();