Auto merge of #1618 - jtgeibel:conduit-hyper-round2, r=sgrif

Switch to `conduit-hyper` in place of `civet`

`conduit-hyper` now handles normalizing paths, such that `//api/v1`
becomes `/api/v1` and doesn't break our router.

Author: bors

Cargo.lock

@@ -29,7 +29,6 @@ rustdoc-args = [
 
 [dependencies]
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
-old_semver = { path = "src/old_semver", version = "0.1.0" }
 rand = "0.3"
 git2 = "0.6.4"
 flate2 = "1.0"
@@ -77,7 +76,7 @@ conduit-middleware = "0.8"
 conduit-router = "0.8"
 conduit-static = "0.8"
 conduit-git-http-backend = "0.8"
-civet = "0.9"
+conduit-hyper = "0.1.3"
 
 [dev-dependencies]
 conduit-test = "0.8"

Cargo.toml

@@ -12,12 +12,11 @@ The server does the following things:
 3. Reads values from environment variables to configure a new instance of `cargo_registry::App`
 4. Adds middleware to the app by calling `cargo_registry::middleware`
 5. Syncs the categories defined in *src/categories.toml* with the categories in the database
-6. Starts a [civet][] `Server` that uses the `cargo_registry::App` instance
+6. Starts a [hyper] server that uses the `cargo_registry::App` instance
 7. Tells Nginx on Heroku that the application is ready to receive requests, if running on Heroku
-8. Blocks forever (or until the process is killed) waiting to receive messages on a channel that no
-   messages are ever sent to, in order to outive the civet `Server` threads
+8. Blocks forever (or until the process is killed)
 
-[civet]: https://crates.io/crates/civet
+[hyper]: https://crates.io/crates/hyper
 
 ## Routes
 

docs/BACKEND.md

@@ -5,10 +5,10 @@ use jemalloc_ctl;
 use std::{
     env,
     fs::{self, File},
-    sync::{mpsc::channel, Arc},
+    sync::Arc,
 };
 
-use civet::Server;
+use conduit_hyper::Service;
 
 fn main() {
     let _ = jemalloc_ctl::set_background_thread(true);
@@ -66,9 +66,8 @@ fn main() {
     } else {
         50
     };
-    let mut cfg = civet::Config::new();
-    cfg.port(port).threads(threads).keep_alive(true);
-    let _a = Server::start(cfg, app);
+    let addr = ([127, 0, 0, 1], port).into();
+    let server = Service::new(app, threads);
 
     println!("listening on port {}", port);
 
@@ -79,6 +78,5 @@ fn main() {
     }
 
     // TODO: handle a graceful shutdown by just waiting for a SIG{INT,TERM}
-    let (_tx, rx) = channel::<()>();
-    rx.recv().unwrap();
+    server.run(addr);
 }

src/bin/server.rs

@@ -1,7 +1,7 @@
 use std::{io::Read, net::SocketAddr};
 
 use conduit::Request;
-use old_semver::semver;
+use conduit_hyper::semver;
 
 // Can't derive Debug because of Request.
 #[allow(missing_debug_implementations)]