Permalink
Browse files

fix the memcached parameters I somehow clobbered

  • Loading branch information...
1 parent 56f88ae commit 710845faae9b8597427dd9b5f0181c68fb4770ea @djosephsen djosephsen committed Apr 11, 2013
Showing with 16 additions and 5 deletions.
  1. +15 −5 gmetad/conf.c.in
  2. +1 −0 gmetad/conf.h
View
@@ -278,21 +278,30 @@ static DOTCONF_CB(cb_carbon_timeout)
return NULL;
}
-static DOTCONF_CB(cb_graphite_prefix)
+static DOTCONF_CB(cb_memcached_parameters)
{
gmetad_config_t *c = (gmetad_config_t*) cmd->option->info;
- debug_msg("Enabling Graphite proxy to %s", cmd->data.str);
- c->graphite_prefix = strdup (cmd->data.str);
+ debug_msg("Enabling memcached parameters to %s", cmd->data.str);
+ c->memcached_parameters = strdup (cmd->data.str);
return NULL;
}
-static DOTCONF_CB(cb_graphite_path)
+static DOTCONF_CB(cb_graphite_prefix)
{
gmetad_config_t *c = (gmetad_config_t*) cmd->option->info;
debug_msg("Enabling Graphite proxy to %s", cmd->data.str);
- c->graphite_path = strdup (cmd->data.str);
+ c->graphite_prefix = strdup (cmd->data.str);
return NULL;
}
+
+static DOTCONF_CB(cb_graphite_path)
+{
+ gmetad_config_t *c = (gmetad_config_t*) cmd->option->info;
+ debug_msg("Setting Graphite path to %s", cmd->data.str);
+ c->graphite_path = strdup (cmd->data.str);
+ return NULL;
+}
+
static DOTCONF_CB(cb_unsummarized_metrics)
{
int i;
@@ -337,6 +346,7 @@ static configoption_t gmetad_options[] =
{"carbon_server", ARG_STR, cb_carbon_server, &gmetad_config, 0},
{"carbon_port", ARG_INT, cb_carbon_port, &gmetad_config, 0},
{"carbon_timeout", ARG_INT, cb_carbon_timeout, &gmetad_config, 0},
+ {"memcached_parameters", ARG_STR, cb_memcached_parameters, &gmetad_config, 0},
{"graphite_prefix", ARG_STR, cb_graphite_prefix, &gmetad_config, 0},
{"graphite_path", ARG_STR, cb_graphite_path, &gmetad_config, 0},
{"unsummarized_metrics", ARG_LIST, cb_unsummarized_metrics, &gmetad_config, 0},
View
@@ -21,6 +21,7 @@ typedef struct
char *carbon_server;
int carbon_port;
int carbon_timeout;
+ char *memcached_parameters;
char *graphite_prefix;
char *graphite_path;
int scalable_mode;

0 comments on commit 710845f

Please sign in to comment.