projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore new dirs
[collectd.git]
/
src
/
redis.c
diff --git
a/src/redis.c
b/src/redis.c
index
9d26828
..
92be18f
100644
(file)
--- a/
src/redis.c
+++ b/
src/redis.c
@@
-28,10
+28,16
@@
#include <pthread.h>
#include <credis.h>
#include <pthread.h>
#include <credis.h>
+#ifndef HOST_NAME_MAX
+# define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
+#endif
+
#define REDIS_DEF_HOST "localhost"
#define REDIS_DEF_HOST "localhost"
+#define REDIS_DEF_PASSWD ""
#define REDIS_DEF_PORT 6379
#define REDIS_DEF_TIMEOUT 2000
#define MAX_REDIS_NODE_NAME 64
#define REDIS_DEF_PORT 6379
#define REDIS_DEF_TIMEOUT 2000
#define MAX_REDIS_NODE_NAME 64
+#define MAX_REDIS_PASSWD_LENGTH 512
/* Redis plugin configuration example:
*
/* Redis plugin configuration example:
*
@@
-50,7
+56,7
@@
struct redis_node_s
{
char name[MAX_REDIS_NODE_NAME];
char host[HOST_NAME_MAX];
{
char name[MAX_REDIS_NODE_NAME];
char host[HOST_NAME_MAX];
- char passwd[
HOST_NAME_MAX
];
+ char passwd[
MAX_REDIS_PASSWD_LENGTH
];
int port;
int timeout;
int port;
int timeout;
@@
-133,7
+139,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' "
@@
-225,8
+231,8
@@
static void redis_submit_d (char *plugin_instance,
static int redis_init (void) /* {{{ */
{
static int redis_init (void) /* {{{ */
{
- redis_node_t rn = { "default", REDIS_DEF_HOST, REDIS_DEF_P
ORT
,
- REDIS_DEF_TIMEOUT, /* next = */ NULL };
+ redis_node_t rn = { "default", REDIS_DEF_HOST, REDIS_DEF_P
ASSWD
,
+ REDIS_DEF_
PORT, REDIS_DEF_
TIMEOUT, /* next = */ NULL };
if (nodes_head == NULL)
redis_node_add (&rn);
if (nodes_head == NULL)
redis_node_add (&rn);
@@
-254,9
+260,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);