minhttpd/server
1
0
Fork 0
Code Issues Pull requests Wiki Activity

let's return a Result from create_app

Browse source 
with the possibility that any errors could be reported/handled by the
caller. the lambda in server::new(|| ...) doesn't care though
This commit is contained in:
Damjan Georgievski 2018-07-23 00:32:56 +02:00
parent d2f9578b68
commit 306c545151
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/web.rs
View file

@ -11,16 +11,17 @@ use std::path::PathBuf;
use std;
use bytes;
pub fn create_app(directory: &PathBuf) -> App<PathBuf> {
let root = directory.to_path_buf();
let static_files = fs::StaticFiles::new(&root).unwrap()
pub fn create_app(directory: &PathBuf) -> Result<App<PathBuf>, error::Error> {
let root = directory.to_path_buf(); // practically makes a copy, so it can be used as state
let static_files = fs::StaticFiles::new(&root)?
.show_files_listing()
.files_listing_renderer(handle_directory);
App::with_state(root)
let app = App::with_state(root)
.middleware(middleware::Logger::new(r#"%a "%r" %s %b "%{Referer}i" "%{User-Agent}i" %T"#))
.resource(r"/{tail:.*}.tar", |r| r.get().f(handle_tar))
.resource(r"/favicon.ico", |r| r.get().f(favicon_ico))
.handler("/", static_files)
.handler("/", static_files);
Ok(app)
}
fn handle_directory<'a, 'b>(