diff --git a/server/src/bin.rs b/server/src/bin.rs index 4b96bb23..56173733 100644 --- a/server/src/bin.rs +++ b/server/src/bin.rs @@ -24,14 +24,8 @@ fn main() { (@arg port: --port +takes_value "The port to listen on. Defaults to 8000.") ) - (@arg verbose: --verbose "Enable extended logging.") ).get_matches(); - let verbose = match matches.occurrences_of("verbose") { - 0 => false, - _ => true, - }; - match matches.subcommand() { ("init", sub_matches) => { let sub_matches = sub_matches.unwrap(); @@ -61,7 +55,7 @@ fn main() { } }; - rojo_core::commands::serve(&project_path, verbose, port); + rojo_core::commands::serve(&project_path, port); }, _ => { eprintln!("Please specify a subcommand!"); diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs index 97535bfa..3a2a4582 100644 --- a/server/src/commands/serve.rs +++ b/server/src/commands/serve.rs @@ -4,16 +4,12 @@ use std::time::Instant; use rand; -use project::{Project, ProjectLoadError}; +use project::Project; use web; -pub fn serve(project_path: &PathBuf, verbose: bool, port: Option) { +pub fn serve(project_path: &PathBuf, port: Option) { let server_id = rand::random::(); - if verbose { - println!("Attempting to locate project at {}...", project_path.display()); - } - let project = match Project::load(project_path) { Ok(v) => { println!("Using project from {}", project_path.display()); @@ -26,7 +22,6 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option) { }; let web_config = web::WebConfig { - verbose, port: port.unwrap_or(project.serve_port), server_id, }; diff --git a/server/src/web.rs b/server/src/web.rs index 850be31e..f74cbeba 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -8,7 +8,6 @@ use web_util::json_response; /// The set of configuration the web server needs to start. pub struct WebConfig { pub port: u64, - pub verbose: bool, pub server_id: u64, }