Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: hide routing mode

This commit is contained in:
Dmitry Simonenko 2017-06-16 14:12:39 +03:00
parent f8cd416aeb
commit e85eab7b25
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odissey.conf
View File

@ -41,7 +41,6 @@ odissey {
} }
routing { routing {
mode "forward"
"test" { "test" {
server "default" server "default"
ttl 5 ttl 5

7
src/od_config.c
View File

@ -69,7 +69,6 @@ static od_keyword_t od_config_keywords[] =
/* routing */ /* routing */
od_keyword("routing", OD_LROUTING), od_keyword("routing", OD_LROUTING),
od_keyword("default", OD_LDEFAULT), od_keyword("default", OD_LDEFAULT),
od_keyword("mode", OD_LMODE),
od_keyword("database", OD_LDATABASE), od_keyword("database", OD_LDATABASE),
od_keyword("user", OD_LUSER), od_keyword("user", OD_LUSER),
od_keyword("password", OD_LPASSWORD), od_keyword("password", OD_LPASSWORD),
@ -470,12 +469,6 @@ od_config_parse_routing(od_config_t *config)
{ {
rc = od_lex_pop(&config->lex, &tk); rc = od_lex_pop(&config->lex, &tk);
switch (rc) { switch (rc) {
/* mode */
case OD_LMODE:
if (od_config_next(config, OD_LSTRING, &tk) == -1)
return -1;
config->scheme->routing = tk->v.string;
continue;
/* route (database name) */ /* route (database name) */
case OD_LSTRING: case OD_LSTRING:
rc = od_config_parse_route(config, tk); rc = od_config_parse_route(config, tk);

16
src/od_scheme.c
View File

@ -49,8 +49,6 @@ void od_scheme_init(od_scheme_t *scheme)
scheme->tls_protocols = NULL; scheme->tls_protocols = NULL;
scheme->pooling = NULL; scheme->pooling = NULL;
scheme->pooling_mode = OD_PUNDEF; scheme->pooling_mode = OD_PUNDEF;
scheme->routing = NULL;
scheme->routing_mode = OD_RUNDEF;
scheme->routing_default = NULL; scheme->routing_default = NULL;
scheme->server_id = 0; scheme->server_id = 0;
scheme->users_default = NULL; scheme->users_default = NULL;
@ -201,19 +199,6 @@ int od_scheme_validate(od_scheme_t *scheme, od_log_t *log)
return -1; return -1;
} }
/* routing mode */
if (scheme->routing == NULL) {
od_error(log, "config", "routing mode is not set");
return -1;
}
if (strcmp(scheme->routing, "forward") == 0)
scheme->routing_mode = OD_RFORWARD;
if (scheme->routing_mode == OD_RUNDEF) {
od_error(log, "config", "unknown routing mode");
return -1;
}
/* listen */ /* listen */
if (scheme->host == NULL) if (scheme->host == NULL)
scheme->host = "*"; scheme->host = "*";
@ -434,7 +419,6 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
} }
od_log(log, ""); od_log(log, "");
od_log(log, "routing"); od_log(log, "routing");
od_log(log, " mode %s", scheme->routing);
od_list_foreach(&scheme->routing_table, i) { od_list_foreach(&scheme->routing_table, i) {
od_schemeroute_t *route; od_schemeroute_t *route;
route = od_container_of(i, od_schemeroute_t, link); route = od_container_of(i, od_schemeroute_t, link);

8
src/od_scheme.h
View File

@ -19,12 +19,6 @@ typedef enum
OD_PTRANSACTION OD_PTRANSACTION
} od_pooling_t; } od_pooling_t;
typedef enum
{
OD_RUNDEF,
OD_RFORWARD
} od_routing_t;
typedef enum typedef enum
{ {
OD_AUNDEF, OD_AUNDEF,
@ -126,8 +120,6 @@ struct od_scheme
/* servers */ /* servers */
od_list_t servers; od_list_t servers;
/* routing */ /* routing */
char *routing;
od_routing_t routing_mode;
od_schemeroute_t *routing_default; od_schemeroute_t *routing_default;
od_list_t routing_table; od_list_t routing_table;
/* users */ /* users */