projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e44afcf
)
redis plugin: Coding style fixes.
author
Florian Forster
<octo@collectd.org>
Mon, 9 Jul 2012 05:48:40 +0000
(07:48 +0200)
committer
Florian Forster
<octo@collectd.org>
Mon, 9 Jul 2012 05:48:40 +0000
(07:48 +0200)
src/redis.c
patch
|
blob
|
history
diff --git
a/src/redis.c
b/src/redis.c
index
9d26828
..
4f4b33b
100644
(file)
--- a/
src/redis.c
+++ b/
src/redis.c
@@
-133,7
+133,7
@@
static int redis_config_node (oconfig_item_t *ci) /* {{{ */
}
else if (strcasecmp ("Timeout", option->key) == 0)
status = cf_util_get_int (option, &rn.timeout);
}
else if (strcasecmp ("Timeout", option->key) == 0)
status = cf_util_get_int (option, &rn.timeout);
- else if (strcasecmp ("Passwd", option->key) == 0)
+ else if (strcasecmp ("Passw
or
d", option->key) == 0)
status = cf_util_get_string_buffer (option, rn.passwd, sizeof (rn.passwd));
else
WARNING ("redis plugin: Option `%s' not allowed inside a `Node' "
status = cf_util_get_string_buffer (option, rn.passwd, sizeof (rn.passwd));
else
WARNING ("redis plugin: Option `%s' not allowed inside a `Node' "
@@
-254,9
+254,11
@@
static int redis_read (void) /* {{{ */
continue;
}
continue;
}
- if ( strlen(rn->passwd) > 0 ) {
+ if (strlen (rn->passwd) > 0)
+ {
DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
DEBUG ("redis plugin: authenticanting node `%s' passwd(%s).", rn->name, rn->passwd);
- if ( credis_auth(rh, rn->passwd) != 0 )
+ status = credis_auth(rh, rn->passwd);
+ if (status != 0)
{
WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
credis_close (rh);
{
WARNING ("redis plugin: unable to authenticate on node `%s'.", rn->name);
credis_close (rh);