Skip to content

Commit

Permalink
Auto merge of #2621 - jtgeibel:hyper-as-default, r=JohnTitor
Browse files Browse the repository at this point in the history
Switch to hyper as the default web server

This is changed so that running `cargo run --bin server` locally uses
the same web server that we are running in production. The `civet`
server can be selected by setting the `WEB_USE_CIVET` environment
variable to any value (including an empty string).

r? @JohnTitor
cc #2204
  • Loading branch information
bors committed Jul 10, 2020
2 parents 3dbbcb0 + 41b73e6 commit 581fe5b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bin/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
}
});

let server = if dotenv::var("USE_HYPER").is_ok() {
let server = if dotenv::var("WEB_USE_CIVET").is_err() {
use tokio::io::AsyncWriteExt;
use tokio::signal::unix::{signal, SignalKind};

Expand Down

0 comments on commit 581fe5b

Please sign in to comment.