From e901ca719ff739524e61fa81b4a30af0fedfeb7c Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Thu, 9 Dec 2021 06:26:06 +0100
Subject: [PATCH] Improved error handling and output

---
 maloja/server.py             | 25 +++++++++++++------------
 maloja/web/jinja/error.jinja |  5 +++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/maloja/server.py b/maloja/server.py
index 97a4abf..91924fe 100644
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -117,18 +117,20 @@ def clean_html(inp):
 @webserver.error(503)
 @webserver.error(505)
 def customerror(error):
-	errorcode = error.status_code
-	errordesc = error.status
-	traceback = error.traceback or error.body
+	error_code = error.status_code
+	error_desc = error.status
+	traceback = error.traceback
+	body = error.body or ""
 	traceback = traceback.strip() if traceback is not None else "No Traceback"
 	adminmode = request.cookies.get("adminmode") == "true" and auth.check(request)
 
 	template = jinja_environment.get_template('error.jinja')
 	return template.render(
-	    errorcode=errorcode,
-	    errordesc=errordesc,
-	    traceback=traceback,
-	    adminmode=adminmode,
+		error_code=error_code,
+		error_desc=error_desc,
+		traceback=traceback,
+		error_full_desc=body,
+		adminmode=adminmode,
 	)
 
 
@@ -345,14 +347,13 @@ def unregister_temp_endpoint():
 def wait_for_db():
 
 	register_endpoints_web_static()
-	register_temp_endpoint()
-
-	database.start_db()
-
 	register_endpoints_api()
 	register_endpoints_web_dynamic()
 
-	unregister_temp_endpoint()
+	database.start_db()
+
+
+
 
 def run_server():
 
diff --git a/maloja/web/jinja/error.jinja b/maloja/web/jinja/error.jinja
index 1202d71..f393cab 100644
--- a/maloja/web/jinja/error.jinja
+++ b/maloja/web/jinja/error.jinja
@@ -8,7 +8,8 @@
 				<div style="background-image:url('/favicon.png')"></div>
 			</td>
 			<td class="text">
-				<h1>{{ errordesc }}</h1><br/>
+				<h1>{{ error_desc }}</h1><br/>
+				{{ error_full_desc }}
 
 			</td>
 		</tr>
@@ -23,7 +24,7 @@
 			{{ traceback }}
 		{%- endautoescape %}</div>
 	{% else %}
-		A team of Korean schoolgirls with katanas has been dispatched to deal with this situation.
+		Kazuma, Aqua, Darkness and Megumin have been dispatched to deal with this situation.
 	{% endif %}