odissey: rename route into server for route scheme

core/od_config.c

@@ -59,7 +59,6 @@ static od_keyword_t od_config_keywords[] =
 	/* routing */
 	od_keyword("routing",         OD_LROUTING),
 	od_keyword("default",         OD_LDEFAULT),
-	od_keyword("route",           OD_LROUTE),
 	od_keyword("mode",            OD_LMODE),
 	od_keyword("database",        OD_LDATABASE),
 	od_keyword("user",            OD_LUSER),
@@ -316,8 +315,8 @@ od_configparse_route(od_config_t *config, od_token_t *name)
 	{
 		rc = od_lexpop(&config->lex, &tk);
 		switch (rc) {
-		/* route */
-		case OD_LROUTE:
+		/* server */
+		case OD_LSERVER:
 			if (od_confignext(config, OD_LSTRING, &tk) == -1)
 				return -1;
 			route->route = tk->v.string;

core/od_config.h

@@ -32,7 +32,6 @@ enum {
 	OD_LSERVER,
 	OD_LROUTING,
 	OD_LDEFAULT,
-	OD_LROUTE,
 	OD_LMODE,
 	OD_LDATABASE,
 	OD_LUSER,

core/od_scheme.c

@@ -343,7 +343,7 @@ void od_schemeprint(od_scheme_t *scheme, od_log_t *log)
 		od_schemeroute_t *route;
 		route = od_container_of(i, od_schemeroute_t, link);
 		od_log(log, NULL, "  <%s>", route->target);
-		od_log(log, NULL, "    route       '%s'", route->route);
+		od_log(log, NULL, "    server      '%s'", route->route);
 		if (route->database)
 			od_log(log, NULL, "    database    '%s'", route->database);
 		if (route->user)

odissey.conf

@@ -30,12 +30,12 @@ odissey {
 	routing {
 		mode "forward"
 		"test" {
-			route "default"
+			server "default"
 			ttl 5
 #			client_max 100
 		}
 #		default {
-#			route "default"
+#			server "default"
 #			user "user"
 #			password "test"
 #			database "database"