From 211ed5c71cd9f3a9e22c6b5c58ef4db9ade943cb Mon Sep 17 00:00:00 2001 From: Roberto De Ioris Date: Mon, 12 Nov 2012 13:09:06 +0100 Subject: [PATCH] corerouter NOT courerouter --- plugins/corerouter/corerouter.c | 8 ++++---- plugins/corerouter/cr.h | 2 +- plugins/http/http.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/corerouter/corerouter.c b/plugins/corerouter/corerouter.c index 4298d904..a7bdaf04 100644 --- a/plugins/corerouter/corerouter.c +++ b/plugins/corerouter/corerouter.c @@ -567,7 +567,7 @@ struct corerouter_session *corerouter_alloc_session(struct uwsgi_corerouter *ucr ucr->cr_table[new_connection]->fd = new_connection; ucr->cr_table[new_connection]->instance_fd = -1; - // map courerouter and socket + // map corerouter and socket ucr->cr_table[new_connection]->corerouter = ucr; ucr->cr_table[new_connection]->ugs = ugs; @@ -859,7 +859,7 @@ void uwsgi_corerouter_loop(int id, void *data) { } -int uwsgi_courerouter_has_has_backends(struct uwsgi_corerouter *ucr) { +int uwsgi_corerouter_has_backends(struct uwsgi_corerouter *ucr) { if (ucr->has_backends) return 1; @@ -899,7 +899,7 @@ int uwsgi_corerouter_init(struct uwsgi_corerouter *ucr) { ucr->max_retries = 3; - ucr->has_backends = uwsgi_courerouter_has_has_backends(ucr); + ucr->has_backends = uwsgi_corerouter_has_backends(ucr); uwsgi_corerouter_setup_sockets(ucr); @@ -923,7 +923,7 @@ int uwsgi_corerouter_init(struct uwsgi_corerouter *ucr) { struct uwsgi_plugin corerouter_plugin = { - .name = "courerouter", + .name = "corerouter", }; void corerouter_send_stats(struct uwsgi_corerouter *ucr) { diff --git a/plugins/corerouter/cr.h b/plugins/corerouter/cr.h index ab28e291..f6e5da31 100644 --- a/plugins/corerouter/cr.h +++ b/plugins/corerouter/cr.h @@ -185,7 +185,7 @@ int uwsgi_cr_map_use_cs(struct uwsgi_corerouter *, struct corerouter_session *); int uwsgi_cr_map_use_to(struct uwsgi_corerouter *, struct corerouter_session *); int uwsgi_cr_map_use_static_nodes(struct uwsgi_corerouter *, struct corerouter_session *); -int uwsgi_courerouter_has_has_backends(struct uwsgi_corerouter *); +int uwsgi_corerouter_has_backends(struct uwsgi_corerouter *); int uwsgi_cr_hook_read(struct corerouter_session *, ssize_t (*)(struct corerouter_session *)); int uwsgi_cr_hook_write(struct corerouter_session *, ssize_t (*)(struct corerouter_session *)); diff --git a/plugins/http/http.c b/plugins/http/http.c index b03398b9..407df132 100644 --- a/plugins/http/http.c +++ b/plugins/http/http.c @@ -1131,7 +1131,7 @@ int http_init() { uhttp.cr.session_size = sizeof(struct http_session); uhttp.cr.alloc_session = http_alloc_session; - if (uhttp.cr.has_sockets && !uwsgi.sockets && !uwsgi_courerouter_has_has_backends(&uhttp.cr)) { + if (uhttp.cr.has_sockets && !uwsgi.sockets && !uwsgi_corerouter_has_backends(&uhttp.cr)) { uwsgi_new_socket(uwsgi_concat2("127.0.0.1:0", "")); uhttp.cr.use_socket = 1; uhttp.cr.socket_num = 0;