server: allow customizing the address and port bound

Author: pietroalbini

src/cli.rs

@@ -23,6 +23,7 @@ use crater::toolchain::Toolchain;
 use failure::{bail, Error, Fallible};
 use rustwide::{cmd::SandboxImage, Workspace, WorkspaceBuilder};
 use std::collections::HashSet;
+use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
@@ -265,7 +266,15 @@ pub enum Crater {
     },
 
     #[structopt(name = "server")]
-    Server,
+    Server {
+        #[structopt(
+            name = "bind",
+            long = "bind",
+            short = "b",
+            help = "The address and port to bind to."
+        )]
+        bind: Option<SocketAddr>,
+    },
 
     #[structopt(name = "agent")]
     Agent {
@@ -589,9 +598,9 @@ impl Crater {
                     bail!("missing experiment: {}", ex.0);
                 }
             }
-            Crater::Server => {
+            Crater::Server { bind } => {
                 let config = Config::load()?;
-                server::run(config)?;
+                server::run(config, bind.unwrap_or(([127, 0, 0, 1], 8000).into()))?;
             }
             Crater::Agent {
                 ref url,

src/server/mod.rs

@@ -21,6 +21,7 @@ use http::{self, header::HeaderValue, Response};
 use hyper::Body;
 use metrics::Metrics;
 use std::sync::{Arc, Mutex};
+use std::net::SocketAddr;
 use warp::{self, Filter};
 
 lazy_static! {
@@ -49,7 +50,7 @@ pub struct Data {
     pub metrics: Metrics,
 }
 
-pub fn run(config: Config) -> Fallible<()> {
+pub fn run(config: Config, bind: SocketAddr) -> Fallible<()> {
     let db = Database::open()?;
     let tokens = tokens::Tokens::load()?;
     let github = GitHubApi::new(&tokens);
@@ -77,7 +78,7 @@ pub fn run(config: Config) -> Fallible<()> {
     data.reports_worker.spawn(data.clone());
     cronjobs::spawn(data.clone());
 
-    info!("running server...");
+    info!("running server on {}...", bind);
 
     let data = Arc::new(data);
 
@@ -100,7 +101,7 @@ pub fn run(config: Config) -> Fallible<()> {
             resp
         });
 
-    warp::serve(routes).run(([127, 0, 0, 1], 8000));
+    warp::serve(routes).run(bind);
 
     Ok(())
 }