X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fredis.c;h=3f78bc3d5739894236730fe600df5b42b663fee2;hb=9688fc1b640c0c50f53e47487fee8dc2ce31dd60;hp=a40d2cd2b48b9f0880f61f61a2177b6a476e1a22;hpb=778a6720a300cf549f5bcca9c22a3ef09d97f16f;p=collectd.git diff --git a/src/redis.c b/src/redis.c index a40d2cd2..3f78bc3d 100644 --- a/src/redis.c +++ b/src/redis.c @@ -294,7 +294,7 @@ static int redis_init (void) /* {{{ */ return (0); } /* }}} int redis_init */ -int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */ +static int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */ { char *str = strstr (info_line, field_name); static char buf[MAX_REDIS_VAL_SIZE]; @@ -321,7 +321,7 @@ int redis_handle_info (char *node, char const *info_line, char const *type, char } /* }}} int redis_handle_info */ -int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) /* {{{ */ +static int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) /* {{{ */ { redisReply *rr; const data_set_t *ds; @@ -376,7 +376,7 @@ int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) / redis_submit(rn->name, rq->type, (strlen(rq->instance) >0)?rq->instance:NULL, val); freeReplyObject (rr); return 0; -} /* }}} int redis_handle_info */ +} /* }}} int redis_handle_query */ static int redis_read (void) /* {{{ */ { @@ -429,7 +429,7 @@ static int redis_read (void) /* {{{ */ redis_handle_info (rn->name, rr->str, "volatile_changes", NULL, "changes_since_last_save", DS_TYPE_GAUGE); redis_handle_info (rn->name, rr->str, "total_connections", NULL, "total_connections_received", DS_TYPE_DERIVE); redis_handle_info (rn->name, rr->str, "total_operations", NULL, "total_commands_processed", DS_TYPE_DERIVE); - redis_handle_info (rn->name, rr->str, "expired_keys", NULL, "expired_keys", DS_TYPE_GAUGE); + redis_handle_info (rn->name, rr->str, "expired_keys", NULL, "expired_keys", DS_TYPE_DERIVE); redis_handle_info (rn->name, rr->str, "pubsub", "channels", "pubsub_channels", DS_TYPE_GAUGE); redis_handle_info (rn->name, rr->str, "pubsub", "patterns", "pubsub_patterns", DS_TYPE_GAUGE); redis_handle_info (rn->name, rr->str, "current_connections", "slaves", "connected_slaves", DS_TYPE_GAUGE);