projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/collectd-5.8'
[collectd.git]
/
src
/
memcached.c
diff --git
a/src/memcached.c
b/src/memcached.c
index
d91454a
..
635088e
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-285,6
+285,12
@@
static int memcached_query_daemon(char *buffer, size_t buffer_size,
close(st->fd);
st->fd = -1;
return -1;
close(st->fd);
st->fd = -1;
return -1;
+ } else if (status == 0) {
+ ERROR("memcached plugin: Instance \"%s\": Connection closed by peer",
+ st->name);
+ close(st->fd);
+ st->fd = -1;
+ return -1;
}
buffer_fill += (size_t)status;
}
buffer_fill += (size_t)status;
@@
-677,9
+683,10
@@
static int memcached_add_read_callback(memcached_t *st) {
/* group = */ "memcached",
/* name = */ callback_name,
/* callback = */ memcached_read,
/* group = */ "memcached",
/* name = */ callback_name,
/* callback = */ memcached_read,
- /* interval = */ 0, &(user_data_t){
- .data = st, .free_func = memcached_free,
- });
+ /* interval = */ 0,
+ &(user_data_t){
+ .data = st, .free_func = memcached_free,
+ });
} /* int memcached_add_read_callback */
/* Configuration handling functiions
} /* int memcached_add_read_callback */
/* Configuration handling functiions