From 203b9e1fb69205f444bbd1efd4d6ceaf01d7dcef Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Thu, 5 Apr 2018 17:11:36 -0700 Subject: [PATCH] Remove VFS references from web --- server/src/commands/serve.rs | 33 +-------------------------------- server/src/web.rs | 1 - 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs index 5117ac28..20b591f1 100644 --- a/server/src/commands/serve.rs +++ b/server/src/commands/serve.rs @@ -1,13 +1,10 @@ -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::process; use std::time::Instant; use rand; use project::{Project, ProjectLoadError}; -use middleware::{MiddlewareChain}; -use middlewares::{DefaultMiddleware, JsonModelMiddleware, ScriptMiddleware}; -use vfs::{VfsSession}; use web; pub fn serve(project_path: &PathBuf, verbose: bool, port: Option) { @@ -57,34 +54,6 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option) { server_id, }; - lazy_static! { - static ref PLUGIN_CHAIN: MiddlewareChain = MiddlewareChain::new(vec![ - Box::new(ScriptMiddleware::new()), - Box::new(JsonModelMiddleware::new()), - Box::new(DefaultMiddleware::new()), - ]); - } - - let vfs = { - let mut vfs = VfsSession::new(&PLUGIN_CHAIN); - - for (name, project_partition) in &project.partitions { - let path = { - let given_path = Path::new(&project_partition.path); - - if given_path.is_absolute() { - given_path.to_path_buf() - } else { - project_path.join(given_path) - } - }; - - vfs.insert_partition(name, path); - } - - Arc::new(Mutex::new(vfs)) - }; - println!("Server listening on port {}", web_config.port); web::start(web_config, project.clone(), Instant::now()); diff --git a/server/src/web.rs b/server/src/web.rs index be6f4667..93684cde 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -1,4 +1,3 @@ -use std::sync::{Arc, Mutex}; use std::time::Instant; use rouille;