projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ceph plugin: Guard against g_num_daemons being zero.
[collectd.git]
/
src
/
ceph.c
diff --git
a/src/ceph.c
b/src/ceph.c
index
5b79239
..
458112a
100644
(file)
--- a/
src/ceph.c
+++ b/
src/ceph.c
@@
-1579,8
+1579,6
@@
static int ceph_read(void)
/******* lifecycle *******/
static int ceph_init(void)
{
/******* lifecycle *******/
static int ceph_init(void)
{
- int ret;
-
#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_DAC_OVERRIDE)
if (check_capability (CAP_DAC_OVERRIDE) != 0)
{
#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_DAC_OVERRIDE)
if (check_capability (CAP_DAC_OVERRIDE) != 0)
{
@@
-1598,9
+1596,13
@@
static int ceph_init(void)
ceph_daemons_print();
ceph_daemons_print();
- ret = cconn_main_loop(ASOK_REQ_VERSION);
+ if (g_num_daemons < 1)
+ {
+ ERROR ("ceph plugin: No daemons configured. See the \"Daemon\" config option.");
+ return ENOENT;
+ }
- return
(ret) ? ret : 0
;
+ return
cconn_main_loop(ASOK_REQ_VERSION)
;
}
static int ceph_shutdown(void)
}
static int ceph_shutdown(void)