X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_putval.c;h=6a3c9e4e13c33fb1469e0f921ec8ca716b049c81;hb=aee87d9c1665ca8823c7489bfc9900ff12e0e177;hp=dd43337ee01390eb3c703a5d8c473bc93eb7ea90;hpb=cc0bb2b472628ccede974a02c822d1f9189f0d21;p=collectd.git diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c index dd43337e..6a3c9e4e 100644 --- a/src/utils_cmd_putval.c +++ b/src/utils_cmd_putval.c @@ -26,12 +26,15 @@ #include "utils_parse_option.h" #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_putval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_putval: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) static int dispatch_values (const data_set_t *ds, value_list_t *vl, FILE *fh, char *buffer) @@ -250,7 +253,7 @@ int create_putval (char *ret, size_t ret_len, /* {{{ */ buffer_ident, (vl->interval > 0) ? CDTIME_T_TO_DOUBLE (vl->interval) - : CDTIME_T_TO_DOUBLE (interval_g), + : CDTIME_T_TO_DOUBLE (plugin_get_interval ()), buffer_values); return (0);