Merge branch 'collectd-5.5'

diff --combined src/redis.c
index 5bcc70350620d864badc2c67ad215c12e9f329ca,2586ca0c83325656c4ebfbee142cb5ddb9742768..4e3de56c8dfa854f5104f9f53b79bb91ee553dec
--- 1/src/redis.c
--- 2/src/redis.c
+++ b/src/redis.c
@@@ -304,7 -304,7 +304,7 @@@ static int redis_handle_info (char *nod
      int i;
  
      str += strlen (field_name) + 1; /* also skip the ':' */
 -    for(i=0;(*str && (isdigit(*str) || *str == '.'));i++,str++)
 +    for(i=0;(*str && (isdigit((unsigned char)*str) || *str == '.'));i++,str++)
        buf[i] = *str;
      buf[i] ='\0';
  
@@@ -399,25 -399,27 +399,27 @@@ static int redis_read (void) /* {{{ *
  
      if (strlen (rn->passwd) > 0)
      {
-       DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
-       rr = redisCommand (rh, "AUTH %s", rn->passwd);
+       DEBUG ("redis plugin: authenticating node `%s' passwd(%s).", rn->name, rn->passwd);
  
-       if (rr == NULL || rr->type != REDIS_REPLY_STATUS)
+       if ((rr = redisCommand (rh, "AUTH %s", rn->passwd)) == NULL)
        {
          WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
-         if (rr != NULL)
-           freeReplyObject (rr);
+         goto redis_fail;
+       }
  
-         redisFree (rh);
-         continue;
+       if (rr->type != REDIS_REPLY_STATUS)
+       {
+         WARNING ("redis plugin: invalid authentication on node `%s'.", rn->name);
+         goto redis_fail;
        }
+ 
+       freeReplyObject (rr);
      }
  
      if ((rr = redisCommand(rh, "INFO")) == NULL)
      {
-       WARNING ("redis plugin: unable to connect to node `%s'.", rn->name);
-       redisFree (rh);
-       continue;
+       WARNING ("redis plugin: unable to get info from node `%s'.", rn->name);
+       goto redis_fail;
      }
  
      redis_handle_info (rn->name, rr->str, "uptime", NULL, "uptime_in_seconds", DS_TYPE_GAUGE);
@@@ -430,20 -432,16 +432,21 @@@
      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_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "evicted_keys", NULL, "evicted_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);
 +    redis_handle_info (rn->name, rr->str, "cache_result", "hits", "keyspace_hits", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "cache_result", "misses", "keyspace_misses", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "total_bytes", "input", "total_net_input_bytes", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "total_bytes", "output", "total_net_output_bytes", DS_TYPE_DERIVE);
  
-     freeReplyObject (rr);
- 
      for (rq = rn->queries; rq != NULL; rq = rq->next)
          redis_handle_query(rh, rn, rq);
  
+ redis_fail:
+     if (rr != NULL)
+       freeReplyObject (rr);
      redisFree (rh);
    }