rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-21 05:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show name of project when starting server

Browse Source
This commit is contained in:
Lucien Greathouse
2018-04-22 17:19:21 -07:00
parent f215df891c
commit 3661d0daec
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/commands/serve.rs
View File

@@ -15,9 +15,9 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
let server_id = rand::random::<u64>();
let project = match Project::load(project_path) {
Ok(v) => {
println!("Using project from {}", project_path.display());
v
Ok(project) => {
println!("Using project \"{}\" from {}", project.name, project_path.display());
project
},
Err(err) => {
match err {
@@ -44,12 +44,6 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
},
};
let web_config = web::WebConfig {
verbose,
port: port.unwrap_or(project.serve_port),
server_id,
};
lazy_static! {
static ref PLUGIN_CHAIN: PluginChain = PluginChain::new(vec![
Box::new(ScriptPlugin::new()),
@@ -78,8 +72,6 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
Arc::new(Mutex::new(vfs))
};
println!("Server listening on port {}", web_config.port);
{
let vfs = vfs.clone();
thread::spawn(move || {
@@ -87,5 +79,13 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
});
}
let web_config = web::WebConfig {
verbose,
port: port.unwrap_or(project.serve_port),
server_id,
};
println!("Server listening on port {}", web_config.port);
web::start(web_config, project.clone(), &PLUGIN_CHAIN, vfs.clone());
}