Replace civet with conduit-hyper

Author: jtgeibel

Cargo.lock

@@ -68,7 +68,7 @@ conduit-middleware = "0.8"
 conduit-router = "0.8"
 conduit-static = "0.8"
 conduit-git-http-backend = "0.8"
-civet = "0.9"
+conduit-hyper = { git = "https://github.com/jtgeibel/conduit-hyper", branch = "stable-1.26" }
 
 [dev-dependencies]
 conduit-test = "0.8"

Cargo.toml

@@ -1,16 +1,15 @@
 #![deny(warnings)]
 
 extern crate cargo_registry;
-extern crate civet;
+extern crate conduit_hyper;
 extern crate env_logger;
 extern crate git2;
 
 use cargo_registry::{env, Env};
-use civet::Server;
+use conduit_hyper::Server;
 use std::env;
 use std::fs::{self, File};
 use std::sync::Arc;
-use std::sync::mpsc::channel;
 
 fn main() {
     // Initialize logging
@@ -66,9 +65,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 = Server::http(addr, app, threads).unwrap();
 
     println!("listening on port {}", port);
 
@@ -79,6 +77,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().unwrap();
 }