X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fceph.c;h=df4a720e6f0794ba2c8fd49a248145685cb0b565;hb=849f5394cce97a76da080f6cd9e5194b7f4ee0f0;hp=3accbd3f80d20a8d9b3c5c8e28af961c2d613aa9;hpb=ba1015262cdc912f9d01ab5a76037e65033c54c5;p=collectd.git diff --git a/src/ceph.c b/src/ceph.c index 3accbd3f..df4a720e 100644 --- a/src/ceph.c +++ b/src/ceph.c @@ -280,7 +280,7 @@ static int ceph_cb_number(void *ctx, const char *number_val, * the same type of other "Bytes". Instead of keeping an "average" or * "rate", use the "sum" in the pair and assign that to the derive * value. */ - if (convert_special_metrics && (state->depth >= 2) && + if (convert_special_metrics && (state->depth > 2) && (strcmp("filestore", state->stack[state->depth - 2]) == 0) && (strcmp("journal_wr_bytes", state->stack[state->depth - 1]) == 0) && (strcmp("avgcount", state->key) == 0)) { @@ -1341,7 +1341,7 @@ static int cconn_main_loop(uint32_t request_type) { struct cconn *io = io_array + i; ret = cconn_prepare(io, fds + nfds); if (ret < 0) { - WARNING("ceph plugin: cconn_prepare(name=%s,i=%zu,st=%d)=%d", + WARNING("ceph plugin: cconn_prepare(name=%s,i=%" PRIsz ",st=%d)=%d", io->d->name, i, io->state, ret); cconn_close(io); io->request_type = ASOK_REQ_NONE;