From 3234ba71d2f5a7aa30065fb9e74216a09fce1464 Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Sun, 21 Apr 2019 16:00:47 +0200
Subject: Print error on the web page rather than on the terminal

---
 src/listing.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/listing.rs')

diff --git a/src/listing.rs b/src/listing.rs
index 6aa1eac..ccb188c 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -10,7 +10,6 @@ use std::time::SystemTime;
 use strum_macros::{Display, EnumString};
 
 use crate::archive;
-use crate::errors;
 use crate::renderer;
 use crate::themes;
 
@@ -263,10 +262,9 @@ pub fn directory_listing<S>(
                     .body(Body::Streaming(Box::new(once(Ok(content))))))
             }
             Err(err) => {
-                errors::print_error_chain(err);
                 Ok(HttpResponse::Ok()
                     .status(http::StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(""))
+                    .body(err.to_string()))
             }
         }
     } else {
-- 
cgit v1.2.3


From 6df18a5f6724b5ca010424b4dbf748a7bc78ef4e Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Sun, 21 Apr 2019 16:14:22 +0200
Subject: cargo fmt

---
 src/listing.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/listing.rs')

diff --git a/src/listing.rs b/src/listing.rs
index ccb188c..a9e4f5f 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -261,11 +261,9 @@ pub fn directory_listing<S>(
                     .chunked()
                     .body(Body::Streaming(Box::new(once(Ok(content))))))
             }
-            Err(err) => {
-                Ok(HttpResponse::Ok()
-                    .status(http::StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(err.to_string()))
-            }
+            Err(err) => Ok(HttpResponse::Ok()
+                .status(http::StatusCode::INTERNAL_SERVER_ERROR)
+                .body(err.to_string())),
         }
     } else {
         Ok(HttpResponse::Ok()
-- 
cgit v1.2.3


From 23567f3b73ef309ba9afda51e084751b64942c53 Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Sun, 21 Apr 2019 19:21:59 +0200
Subject: Print upload/archive errors also in terminal

---
 src/listing.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/listing.rs')

diff --git a/src/listing.rs b/src/listing.rs
index a9e4f5f..4473c6d 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -261,9 +261,12 @@ pub fn directory_listing<S>(
                     .chunked()
                     .body(Body::Streaming(Box::new(once(Ok(content))))))
             }
-            Err(err) => Ok(HttpResponse::Ok()
-                .status(http::StatusCode::INTERNAL_SERVER_ERROR)
-                .body(err.to_string())),
+            Err(err) => {
+                log::error!("{}", &err);
+                Ok(HttpResponse::Ok()
+                    .status(http::StatusCode::INTERNAL_SERVER_ERROR)
+                    .body(err.to_string()))
+            }
         }
     } else {
         Ok(HttpResponse::Ok()
-- 
cgit v1.2.3


From 6dad3eb1bf0cb3b36cdb3b312cca7caa91de2f57 Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Mon, 22 Apr 2019 00:39:38 +0200
Subject: Properly log error + added render_error method

---
 src/listing.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/listing.rs')

diff --git a/src/listing.rs b/src/listing.rs
index 4473c6d..0ac02ff 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -12,6 +12,7 @@ use strum_macros::{Display, EnumString};
 use crate::archive;
 use crate::renderer;
 use crate::themes;
+use crate::errors;
 
 /// Query parameters
 #[derive(Deserialize)]
@@ -262,10 +263,10 @@ pub fn directory_listing<S>(
                     .body(Body::Streaming(Box::new(once(Ok(content))))))
             }
             Err(err) => {
-                log::error!("{}", &err);
+                errors::log_error_chain(err.to_string());
                 Ok(HttpResponse::Ok()
                     .status(http::StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(err.to_string()))
+                    .body(renderer::render_error(&err.to_string(), serve_path).into_string())
             }
         }
     } else {
-- 
cgit v1.2.3


From 92953d1500d6687cac2a4494e38aecac264e4789 Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Mon, 22 Apr 2019 01:05:34 +0200
Subject: Fixed syntax error

---
 src/listing.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/listing.rs')

diff --git a/src/listing.rs b/src/listing.rs
index 0ac02ff..a030feb 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -10,9 +10,9 @@ use std::time::SystemTime;
 use strum_macros::{Display, EnumString};
 
 use crate::archive;
+use crate::errors;
 use crate::renderer;
 use crate::themes;
-use crate::errors;
 
 /// Query parameters
 #[derive(Deserialize)]
@@ -266,7 +266,7 @@ pub fn directory_listing<S>(
                 errors::log_error_chain(err.to_string());
                 Ok(HttpResponse::Ok()
                     .status(http::StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(renderer::render_error(&err.to_string(), serve_path).into_string())
+                    .body(renderer::render_error(&err.to_string(), serve_path).into_string()))
             }
         }
     } else {
-- 
cgit v1.2.3