diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-07 11:49:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-07 12:42:05 +0000 |
commit | 2e85f9325a797977eea9dfea0a925775ddd211d9 (patch) | |
tree | 452c7f30d62fca5755f659b99e4e53c7b03afc21 /collectors/statsd.plugin/statsd.c | |
parent | Releasing debian version 1.19.0-4. (diff) | |
download | netdata-2e85f9325a797977eea9dfea0a925775ddd211d9.tar.xz netdata-2e85f9325a797977eea9dfea0a925775ddd211d9.zip |
Merging upstream version 1.29.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/statsd.plugin/statsd.c')
-rw-r--r-- | collectors/statsd.plugin/statsd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/collectors/statsd.plugin/statsd.c b/collectors/statsd.plugin/statsd.c index e8e6301a8..a8f94130a 100644 --- a/collectors/statsd.plugin/statsd.c +++ b/collectors/statsd.plugin/statsd.c @@ -22,7 +22,7 @@ #define STATSD_FIRST_PTR_MUTEX_UNLOCK(index) netdata_mutex_unlock(&((index)->first_mutex)) #define STATSD_DICTIONARY_OPTIONS DICTIONARY_FLAG_DEFAULT #else -#define STATSD_AVL_TREE avl_tree +#define STATSD_AVL_TREE avl_tree_type #define STATSD_AVL_INSERT avl_insert #define STATSD_AVL_SEARCH avl_search #define STATSD_AVL_INDEX_INIT { .root = NULL, .compar = statsd_metric_compare } @@ -698,7 +698,10 @@ static inline size_t statsd_process(char *buffer, size_t size, int require_newli s = name_end = (char *)statsd_parse_skip_up_to(name = s, ':', '|'); if(name == name_end) { - s = statsd_parse_skip_spaces(s); + if (*s) { + s++; + s = statsd_parse_skip_spaces(s); + } continue; } @@ -1324,7 +1327,7 @@ static int statsd_readfile(const char *filename, STATSD_APP *app, STATSD_APP_CHA else if (!strcmp(name, "dimension")) { // metric [name [type [multiplier [divisor]]]] char *words[10]; - pluginsd_split_words(value, words, 10); + pluginsd_split_words(value, words, 10, NULL, NULL, 0); int pattern = 0; size_t i = 0; |