X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_flush.c;h=b180a5019780e037ab2c90e86581f0eb90af1fcc;hp=8eec975bda2e84971e0501b84c37ae05f226edb4;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hpb=79963d13c1884d1d92667cc502ad20758b084a12 diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c index 8eec975b..b180a501 100644 --- a/src/utils_cmd_flush.c +++ b/src/utils_cmd_flush.c @@ -1,6 +1,6 @@ /** * collectd - src/utils_cmd_flush.c - * Copyright (C) 2008 Sebastian Harl + * Copyright (C) 2008, 2016 Sebastian Harl * Copyright (C) 2008 Florian Forster * * Permission is hereby granted, free of charge, to any person obtaining a @@ -31,114 +31,147 @@ #include "common.h" #include "plugin.h" #include "utils_cmd_flush.h" -#include "utils_parse_option.h" -int handle_flush(FILE *fh, char *buffer) { - int success = 0; - int error = 0; - - double timeout = 0.0; - char **plugins = NULL; - size_t plugins_num = 0; - char **identifiers = NULL; - size_t identifiers_num = 0; - -#define PRINT_TO_SOCK(fh, ...) \ - do { \ - if (fprintf(fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING("handle_flush: failed to write to socket #%i: %s", fileno(fh), \ - sstrerror(errno, errbuf, sizeof(errbuf))); \ - strarray_free(plugins, plugins_num); \ - strarray_free(identifiers, identifiers_num); \ - return -1; \ - } \ - fflush(fh); \ - } while (0) - - if ((fh == NULL) || (buffer == NULL)) - return (-1); - - DEBUG("utils_cmd_flush: handle_flush (fh = %p, buffer = %s);", (void *)fh, - buffer); +cmd_status_t cmd_parse_flush(size_t argc, char **argv, cmd_flush_t *ret_flush, + const cmd_options_t *opts, + cmd_error_handler_t *err) { - if (strncasecmp("FLUSH", buffer, strlen("FLUSH")) != 0) { - PRINT_TO_SOCK(fh, "-1 Cannot parse command.\n"); - return (-1); + if ((ret_flush == NULL) || (opts == NULL)) { + errno = EINVAL; + cmd_error(CMD_ERROR, err, "Invalid arguments to cmd_parse_flush."); + return CMD_ERROR; } - buffer += strlen("FLUSH"); - while (*buffer != 0) { + for (size_t i = 0; i < argc; i++) { char *opt_key; char *opt_value; int status; opt_key = NULL; opt_value = NULL; - status = parse_option(&buffer, &opt_key, &opt_value); + status = cmd_parse_option(argv[i], &opt_key, &opt_value, err); if (status != 0) { - PRINT_TO_SOCK(fh, "-1 Parsing options failed.\n"); - strarray_free(plugins, plugins_num); - strarray_free(identifiers, identifiers_num); - return (-1); + if (status == CMD_NO_OPTION) + cmd_error(CMD_PARSE_ERROR, err, "Invalid option string `%s'.", argv[i]); + cmd_destroy_flush(ret_flush); + return CMD_PARSE_ERROR; } - if (strcasecmp("plugin", opt_key) == 0) - strarray_add(&plugins, &plugins_num, opt_value); - else if (strcasecmp("identifier", opt_key) == 0) - strarray_add(&identifiers, &identifiers_num, opt_value); - else if (strcasecmp("timeout", opt_key) == 0) { + if (strcasecmp("plugin", opt_key) == 0) { + strarray_add(&ret_flush->plugins, &ret_flush->plugins_num, opt_value); + } else if (strcasecmp("identifier", opt_key) == 0) { + identifier_t *id = + realloc(ret_flush->identifiers, + (ret_flush->identifiers_num + 1) * sizeof(*id)); + if (id == NULL) { + cmd_error(CMD_ERROR, err, "realloc failed."); + cmd_destroy_flush(ret_flush); + return CMD_ERROR; + } + + ret_flush->identifiers = id; + id = ret_flush->identifiers + ret_flush->identifiers_num; + ret_flush->identifiers_num++; + if (parse_identifier(opt_value, &id->host, &id->plugin, + &id->plugin_instance, &id->type, &id->type_instance, + opts->identifier_default_host) != 0) { + cmd_error(CMD_PARSE_ERROR, err, "Invalid identifier `%s'.", opt_value); + cmd_destroy_flush(ret_flush); + return CMD_PARSE_ERROR; + } + } else if (strcasecmp("timeout", opt_key) == 0) { char *endptr; errno = 0; endptr = NULL; - timeout = strtod(opt_value, &endptr); - - if ((endptr == opt_value) || (errno != 0) || (!isfinite(timeout))) { - PRINT_TO_SOCK(fh, "-1 Invalid value for option `timeout': " - "%s\n", - opt_value); - strarray_free(plugins, plugins_num); - strarray_free(identifiers, identifiers_num); - return (-1); - } else if (timeout < 0.0) { - timeout = 0.0; + ret_flush->timeout = strtod(opt_value, &endptr); + + if ((endptr == opt_value) || (errno != 0) || + (!isfinite(ret_flush->timeout))) { + cmd_error(CMD_PARSE_ERROR, err, + "Invalid value for option `timeout': %s", opt_value); + cmd_destroy_flush(ret_flush); + return CMD_PARSE_ERROR; + } else if (ret_flush->timeout < 0.0) { + ret_flush->timeout = 0.0; } } else { - PRINT_TO_SOCK(fh, "-1 Cannot parse option %s\n", opt_key); - strarray_free(plugins, plugins_num); - strarray_free(identifiers, identifiers_num); - return (-1); + cmd_error(CMD_PARSE_ERROR, err, "Cannot parse option `%s'.", opt_key); + cmd_destroy_flush(ret_flush); + return CMD_PARSE_ERROR; } - } /* while (*buffer != 0) */ + } + + return CMD_OK; +} /* cmd_status_t cmd_parse_flush */ + +cmd_status_t cmd_handle_flush(FILE *fh, char *buffer) { + cmd_error_handler_t err = {cmd_error_fh, fh}; + cmd_t cmd; - for (size_t i = 0; (i == 0) || (i < plugins_num); i++) { + int success = 0; + int error = 0; + int status; + + if ((fh == NULL) || (buffer == NULL)) + return -1; + + DEBUG("utils_cmd_flush: cmd_handle_flush (fh = %p, buffer = %s);", (void *)fh, + buffer); + + if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) + return status; + if (cmd.type != CMD_FLUSH) { + cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", + CMD_TO_STRING(cmd.type)); + cmd_destroy(&cmd); + return CMD_UNKNOWN_COMMAND; + } + + for (size_t i = 0; (i == 0) || (i < cmd.cmd.flush.plugins_num); i++) { char *plugin = NULL; - if (plugins_num != 0) - plugin = plugins[i]; + if (cmd.cmd.flush.plugins_num != 0) + plugin = cmd.cmd.flush.plugins[i]; - for (size_t j = 0; (j == 0) || (j < identifiers_num); j++) { + for (size_t j = 0; (j == 0) || (j < cmd.cmd.flush.identifiers_num); j++) { char *identifier = NULL; - int status; - - if (identifiers_num != 0) - identifier = identifiers[j]; + char buf[1024]; + + if (cmd.cmd.flush.identifiers_num != 0) { + identifier_t *id = cmd.cmd.flush.identifiers + j; + if (format_name(buf, sizeof(buf), id->host, id->plugin, + id->plugin_instance, id->type, + id->type_instance) != 0) { + error++; + continue; + } + identifier = buf; + } - status = plugin_flush(plugin, DOUBLE_TO_CDTIME_T(timeout), identifier); - if (status == 0) + if (plugin_flush(plugin, DOUBLE_TO_CDTIME_T(cmd.cmd.flush.timeout), + identifier) == 0) success++; else error++; } } - PRINT_TO_SOCK(fh, "0 Done: %i successful, %i errors\n", success, error); + cmd_error(CMD_OK, &err, "Done: %i successful, %i errors", success, error); - strarray_free(plugins, plugins_num); - strarray_free(identifiers, identifiers_num); - return (0); + cmd_destroy(&cmd); + return 0; #undef PRINT_TO_SOCK -} /* int handle_flush */ +} /* cmd_status_t cmd_handle_flush */ + +void cmd_destroy_flush(cmd_flush_t *flush) { + if (flush == NULL) + return; + + strarray_free(flush->plugins, flush->plugins_num); + flush->plugins = NULL; + flush->plugins_num = 0; -/* vim: set sw=4 ts=4 tw=78 noexpandtab : */ + sfree(flush->identifiers); + flush->identifiers_num = 0; +} /* void cmd_destroy_flush */