Skip to content

ref: Revert changes to HttpServer startup #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untitaker merged 2 commits into from
Nov 13, 2019
Merged

ref: Revert changes to HttpServer startup #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b23d32
Revert "fix: Spawn http server on separate thread (#312)"
untitaker Nov 13, 2019
3dad5e1
Revert "fix: Start clientconnector earlier"
untitaker Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions server/src/actors/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,8 @@ pub struct Server {
impl Server {
pub fn start(config: Config) -> Result<Addr<Self>, ServerError> {
metric!(counter("server.starting") += 1);
// spawn our own services into the default arbiter
let service_state = ServiceState::start(config)?;

// spawn the HTTP server into a separate arbiter to make connects faster
Ok(Arbiter::start(|_ctx| {
let http_server = service::start(service_state).unwrap();
Server { http_server }
}))
let http_server = service::start(ServiceState::start(config)?)?;
Ok(Server { http_server }.start())
}
}

Expand Down
12 changes: 6 additions & 6 deletions server/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@ impl ServiceState {
.context(ServerErrorKind::ConfigError)?
.start();

let connector = ClientConnector::default()
.limit(config.max_concurrent_requests())
.start();

System::current().registry().set(connector);

Ok(ServiceState {
config: config.clone(),
upstream_relay: upstream_relay.clone(),
Expand Down Expand Up @@ -299,6 +293,12 @@ pub fn start(state: ServiceState) -> Result<Recipient<server::StopServer>, Serve
.backlog(config.max_pending_connections())
.disable_signals();

let connector = ClientConnector::default()
.limit(config.max_concurrent_requests())
.start();

System::current().registry().set(connector);

server = listen(server, &config)?;
server = listen_ssl(server, &config)?;

Expand Down