diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2020-05-22 11:06:27 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2020-05-22 11:06:56 +0200 |
| commit | 4671b883b9b38672bd452e738f17b6a9d9be1442 (patch) | |
| tree | 3132ae30f158563ca36a62e4c0b3a0d617336101 | |
| parent | 71b85a33fa41237b527e83f5f32178205dc43d21 (diff) | |
Change output to use log facade
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | src/main.rs | 24 | ||||
| -rw-r--r-- | src/purge.rs | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/main.rs b/src/main.rs index 34f7811..6480b4a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -72,7 +72,7 @@ fn create_random_file(dir: &str) -> io::Result<(File, String)> { fn delete_file(dir: &str, name: &str) { let pathbuf = Path::new(dir).join(name); if let Err(err) = fs::remove_file(pathbuf) { - println!("Failed to remove {}/{}: {}", dir, name, err); + error!("Failed to remove {}/{}: {}", dir, name, err); } } @@ -192,7 +192,7 @@ async fn on_get(req: Request<Body>) -> Result<Response<Body>, Box<dyn Error>> { let file = tokio::fs::File::open(&pathbuf).await; match file { Err(err) => { - println!("Couldn't open {}: {}", pathbuf.display(), err); + error!("Couldn't open {}: {}", pathbuf.display(), err); return Ok(respond_404()?); }, Ok(file) => { @@ -239,7 +239,7 @@ async fn on_put(req: Request<Body>) -> Result<Response<Body>, Infallible> { let fileres = create_random_file(&CONFIG.data); if let Err(err) = fileres { - println!("Failed to create random file: {}", err); + error!("Failed to create random file: {}", err); return Ok(Response::builder() .status(500) .body(Body::from(ERR_500_HTML)) @@ -247,7 +247,7 @@ async fn on_put(req: Request<Body>) -> Result<Response<Body>, Infallible> { } let (mut file, name) = fileres.unwrap(); - println!("Created file '{}/{}'", CONFIG.data, name); + info!("Created file '{}/{}'", CONFIG.data, name); let mut reqbody = req.into_body(); let mut bodysize: usize = 0; @@ -259,21 +259,21 @@ async fn on_put(req: Request<Body>) -> Result<Response<Body>, Infallible> { let chunk = chunkopt.unwrap(); if let Err(err) = chunk { - println!("Upload file transfer error: {}", err); + error!("Upload file transfer error: {}", err); delete_file(&CONFIG.data, &name); return respond_500(); } - + let ch = chunk.unwrap(); if bodysize + ch.len() > CONFIG.max_file_size as usize { - println!("Uploaded file exceeds max size ({} bytes)", CONFIG.max_file_size); + error!("Uploaded file exceeds max size ({} bytes)", CONFIG.max_file_size); delete_file(&CONFIG.data, &name); return respond_413(); } bodysize += ch.len(); if let Err(err) = file.write(&ch) { - println!("File write error: {}", err); + error!("File write error: {}", err); delete_file(&CONFIG.data, &name); return respond_500(); } @@ -289,7 +289,7 @@ async fn on_put(req: Request<Body>) -> Result<Response<Body>, Infallible> { } async fn on_request(req: Request<Body>) -> Result<Response<Body>, Infallible> { - println!("{} {}", req.method(), req.uri()); + debug!("{} {}", req.method(), req.uri()); let res = match req.method() { &Method::GET | &Method::HEAD => on_get(req).await, @@ -298,7 +298,7 @@ async fn on_request(req: Request<Body>) -> Result<Response<Body>, Infallible> { }; if let Err(res) = res { - println!("Error: {}", res); + error!("Error: {}", res); return respond_500(); } else { return Ok(res.unwrap()); @@ -330,9 +330,9 @@ async fn main() { let server = Server::bind(&addr).serve(make_svc); - println!("Server listening on {}", addr); + info!("Server listening on {}", addr); if let Err(e) = server.await { - eprintln!("Server error: {}", e); + error!("Server error: {}", e); } } diff --git a/src/purge.rs b/src/purge.rs index fc41f49..cbbbf54 100644 --- a/src/purge.rs +++ b/src/purge.rs @@ -47,7 +47,7 @@ fn do_purge_file(ent: &fs::DirEntry, old_time: time::SystemTime, now: time::Syst let file_age = chrono::Duration::from_std(now.duration_since(atime)?)?; let file_access_time = chrono::DateTime::<chrono::offset::Utc>::from(atime); - println!("Deleting '{}' (last accessed at {}; {}d{}h old)", + debug!("Deleting '{}' (last accessed at {}; {}d{}h old)", ent.file_name().to_string_lossy(), file_access_time.format("%Y-%m-%d %H:%M"), file_age.num_days(), @@ -64,14 +64,14 @@ fn do_purge(dir: &str, old_time: time::SystemTime, now: time::SystemTime) for ent in readdir { let ent = match ent { Err(err) => { - println!("Purge: Readdir error: {}", err); + error!("Purge: Readdir error: {}", err); continue; }, Ok(ent) => ent, }; if let Err(err) = do_purge_file(&ent, old_time, now) { - println!("Purge: {}: {}", ent.file_name().to_string_lossy(), err); + error!("Purge: {}: {}", ent.file_name().to_string_lossy(), err); continue; } } @@ -83,13 +83,13 @@ pub fn purge(dir: &str, expiration: time::Duration) { let now = time::SystemTime::now(); let old_time = match now.checked_sub(expiration) { None => { - println!("Purge failed: now.checked_sub(old) returned None."); + error!("Purge failed: now.checked_sub(old) returned None."); return; }, Some(t) => t, }; if let Err(err) = do_purge(dir, old_time, now) { - println!("Purge failed: {}", err); + error!("Purge failed: {}", err); } } |