From cba28e8e2c509a8946741920cedbe17c78373221 Mon Sep 17 00:00:00 2001 From: Antoine Gersant Date: Sun, 28 Oct 2018 19:09:32 -0700 Subject: [PATCH] Run server on expected port (5050 or custom) --- src/errors.rs | 1 + src/main.rs | 7 +++++-- src/rocket_api.rs | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/errors.rs b/src/errors.rs index 5e8c9c4..30278a9 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -30,6 +30,7 @@ error_chain! { Time(std::time::SystemTimeError); Toml(toml::de::Error); Regex(regex::Error); + RocketConfig(rocket::config::ConfigError); Scrobbler(rustfm_scrobble::ScrobblerError); Vorbis(lewton::VorbisError); } diff --git a/src/main.rs b/src/main.rs index 0d353c7..693350e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -235,10 +235,13 @@ fn run() -> Result<()> { .parse() .or(Err("invalid port number"))?; - // TODO Use port number + let config = rocket::Config::build(rocket::config::Environment::Production) + .port(port) + .finalize()?; + let db_server = db.clone(); std::thread::spawn(move || { - rocket::ignite() + rocket::custom(config) .manage(db_server) .manage(command_sender) .mount(&static_url, StaticFiles::from(web_dir_path)) diff --git a/src/rocket_api.rs b/src/rocket_api.rs index a7c079f..32ea386 100644 --- a/src/rocket_api.rs +++ b/src/rocket_api.rs @@ -82,11 +82,11 @@ impl<'a, 'r> FromRequest<'a, 'r> for Auth { if let Ok(Basic { username, password: Some(password), - }) = Basic::from_str(auth_header_string.trim_start_matches("Basic ")) // Sadness + }) = Basic::from_str(auth_header_string.trim_start_matches("Basic ")) { let db = match request.guard::>>() { Outcome::Success(d) => d, - _ => return Outcome::Failure((Status::InternalServerError, ())) + _ => return Outcome::Failure((Status::InternalServerError, ())), }; if user::auth(db.deref().deref(), &username, &password).unwrap_or(false) { cookies.add_private(get_auth_cookie(&username));