From 7bb148c0e73bff5dfdd27535e35ca91f727fd4c5 Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Sat, 12 May 2018 15:35:57 -0700
Subject: [PATCH] Trim web server a bit and re-enable it

---
 server/src/commands/serve.rs | 25 ++++++++++++-------------
 server/src/web.rs            |  7 ++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index a4d53c97..622ff3f2 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -26,16 +26,11 @@ pub fn serve(project_path: &PathBuf, port: Option<u64>) {
         },
     };
 
-    // let web_config = web::WebConfig {
-    //     port: port.unwrap_or(project.serve_port),
-    //     server_id,
-    //     project: project.clone(),
-    //     start_time: Instant::now(),
-    // };
-
-    // println!("Server listening on port {}", web_config.port);
-
-    // web::start(web_config);
+    let web_config = web::WebConfig {
+        port: port.unwrap_or(project.serve_port),
+        server_id,
+        start_time: Instant::now(),
+    };
 
     let mut partitions = HashMap::new();
 
@@ -59,7 +54,11 @@ pub fn serve(project_path: &PathBuf, port: Option<u64>) {
     let mut session = Session::new(config.clone());
     session.start();
 
-    loop {
-        thread::park();
-    }
+    println!("Server listening on port {}", web_config.port);
+
+    web::start(web_config);
+
+    // loop {
+    //     thread::park();
+    // }
 }
diff --git a/server/src/web.rs b/server/src/web.rs
index 26681331..11b51599 100644
--- a/server/src/web.rs
+++ b/server/src/web.rs
@@ -2,14 +2,12 @@ use std::time::Instant;
 
 use rouille;
 
-use project::Project;
 use web_util::json_response;
 
 /// The set of configuration the web server needs to start.
 pub struct WebConfig {
     pub port: u64,
     pub server_id: u64,
-    pub project: Project,
     pub start_time: Instant,
 }
 
@@ -19,13 +17,13 @@ struct ServerInfo<'a> {
     server_version: &'static str,
     protocol_version: u64,
     server_id: &'a str,
-    project: &'a Project,
     current_time: f64,
 }
 
 /// Start the Rojo web server and park our current thread.
 pub fn start(config: WebConfig) {
     let address = format!("localhost:{}", config.port);
+    let server_version = env!("CARGO_PKG_VERSION");
 
     let server_id = config.server_id.to_string();
 
@@ -41,10 +39,9 @@ pub fn start(config: WebConfig) {
                 };
 
                 json_response(ServerInfo {
-                    server_version: env!("CARGO_PKG_VERSION"),
+                    server_version,
                     protocol_version: 2,
                     server_id: &server_id,
-                    project: &config.project,
                     current_time,
                 })
             },