X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fceph.c;h=4e435b3e251e5ae41c5bd63af05511f90cf3206a;hb=55ffaf9ad7c8b180ac0192adb1a6ff6adc72c5a3;hp=2be17fb383864570d75ba083cbf425fd6dd15a02;hpb=79963d13c1884d1d92667cc502ad20758b084a12;p=collectd.git

diff --git a/src/ceph.c b/src/ceph.c
index 2be17fb3..4e435b3e 100644
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -1027,7 +1027,6 @@ static int cconn_process_data(struct cconn *io, yajl_struct *yajl,
   }
 
   vtmp->vlist = (value_list_t)VALUE_LIST_INIT;
-  sstrncpy(vtmp->vlist.host, hostname_g, sizeof(vtmp->vlist.host));
   sstrncpy(vtmp->vlist.plugin, "ceph", sizeof(vtmp->vlist.plugin));
   sstrncpy(vtmp->vlist.plugin_instance, io->d->name,
            sizeof(vtmp->vlist.plugin_instance));
@@ -1301,15 +1300,22 @@ static int cconn_main_loop(uint32_t request_type) {
   struct timeval end_tv;
   struct cconn io_array[g_num_daemons];
 
-  DEBUG("ceph plugin: entering cconn_main_loop(request_type = %d)",
+  DEBUG("ceph plugin: entering cconn_main_loop(request_type = %" PRIu32 ")",
         request_type);
 
+  if (g_num_daemons < 1) {
+    ERROR("ceph plugin: No daemons configured. See the \"Daemon\" config "
+          "option.");
+    return ENOENT;
+  }
+
   /* create cconn array */
-  memset(io_array, 0, sizeof(io_array));
-  for (size_t i = 0; i < g_num_daemons; ++i) {
-    io_array[i].d = g_daemons[i];
-    io_array[i].request_type = request_type;
-    io_array[i].state = CSTATE_UNCONNECTED;
+  for (size_t i = 0; i < g_num_daemons; i++) {
+    io_array[i] = (struct cconn){
+        .d = g_daemons[i],
+        .request_type = request_type,
+        .state = CSTATE_UNCONNECTED,
+    };
   }
 
   /** Calculate the time at which we should give up */