From 343238733682de6a3844b012b94f3925bdaf2ff4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 20 Sep 2022 00:43:49 +0200 Subject: [PATCH 01/11] add 502 error page --- files/templates/errors/502.html | 194 ++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 files/templates/errors/502.html diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html new file mode 100644 index 000000000..7f7cfce98 --- /dev/null +++ b/files/templates/errors/502.html @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + 500 Internal Server Error + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + site banner + + + +
+
+
+
+
+
+ :#marseydead: + 

+								
500 Internal Server Error

+								

+									Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page
+									but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to
+									fix it. Don't bother them. Thanks ily <3
+								

+							

+						

+					

+				

+			

+		

+		

+			
+		

+		
+	
+
\ No newline at end of file

From 7ed50964499ba415f2f16d31718d63167189e03d Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:45:33 +0200
Subject: [PATCH 02/11] Revert "add 502 error page"

This reverts commit 343238733682de6a3844b012b94f3925bdaf2ff4.
---
 files/templates/errors/502.html | 194 --------------------------------
 1 file changed, 194 deletions(-)
 delete mode 100644 files/templates/errors/502.html

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
deleted file mode 100644
index 7f7cfce98..000000000
--- a/files/templates/errors/502.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		500 Internal Server Error
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-
-	
-		
-			site banner
-		
-		
-		
-		

-			

-				

-					

-						

-							

-								:#marseydead:
-								

-								
500 Internal Server Error

-								

-									Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page
-									but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to
-									fix it. Don't bother them. Thanks ily <3
-								

-							

-						

-					

-				

-			

-		

-		

-			
-		

-		
-	
-
\ No newline at end of file

From 5784c6796903115a6a80ba0df4dddccea9ed86f4 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:47:17 +0200
Subject: [PATCH 03/11] add 502 error page

---
 files/templates/errors/502.html | 443 ++++++++++++++++++++++++++++++++
 1 file changed, 443 insertions(+)
 create mode 100644 files/templates/errors/502.html

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
new file mode 100644
index 000000000..422228515
--- /dev/null
+++ b/files/templates/errors/502.html
@@ -0,0 +1,443 @@
+
+
+
+
+	
+
+	
+
+	
+		
+	
+
+	
+		
+		
+		
+		
+	
+
+	
+
+	
+
+	
+
+	
+		
+	
+
+	
+	
+
+	
+
+	
+	
+500 Internal Server Error
+
+
+	
+	
+	
+	
+
+	
+		
+		
+		
+		
+		
+		
+		
+		
+
+
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+		
+		
+
+		
+
+
+
+
+ 
+
+ 
+
+
+		
+		
+			
+				
+					
+					
+					site banner
+				
+			
+		
+	
+
+
+
+
+
+
+
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+	

+
+		

+
+			
+			
+
+			
+			
+
+			
+			
+
+			
+			
+
+			
+

+	

+		

+			:#marseydead:
+			

+			
500 Internal Server Error

+			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

+			
+
+		

+	

+

+
+
+			
+			
+
+		

+		
+			
+		
+	

+

+
+
+	

+
+		
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

From 08daf18e0b3954306509a3112599d84b0305907f Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:50:01 +0200
Subject: [PATCH 04/11] testing on devrama

---
 files/templates/errors/502.html | 439 +-------------------------------
 1 file changed, 3 insertions(+), 436 deletions(-)

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index 422228515..dd8509389 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -2,442 +2,9 @@
 
 
 
-	
-
-	
-
-	
-		
-	
-
-	
-		
-		
-		
-		
-	
-
-	
-
-	
-
-	
-
-	
-		
-	
-
-	
-	
-
-	
-
-	
-	
-500 Internal Server Error
-
-
-	
-	
-	
-	
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-
-		
-
-
-
-
- 
-
- 
-
-
-		
-		
-			
-				
-					
-					
-					site banner
-				
-			
-		
-	
-
-
-
-
-
-
-
-	
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-	

-
-		

-
-			
-			
-
-			
-			
-
-			
-			
-
-			
-			
-
-			
-

-	

-		

-			:#marseydead:
-			

-			
500 Internal Server Error

-			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

-			
-
-		

-	

-

-
-
-			
-			
-
-		

-		
-			
-		
-	

-

-
-
-	

-
-		
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+	wtf
 
 
 
\ No newline at end of file

From e901ef33cd2641e7783a55c5e28ea1ea8c9205c7 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:50:21 +0200
Subject: [PATCH 05/11] testing on devrama

---
 files/templates/errors/502.html | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index dd8509389..42db88e68 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -1,10 +1,22 @@
+{% extends "default.html" %}
 
-
-
-
-
-
-	wtf
-
+{% block title %}
+500 Internal Server Error
+{% endblock %}
 
-
\ No newline at end of file
+{% block pagetype %}error-500{% endblock %}
+
+{% block content %}
+

+	

+		

+			:#marseydead:
+			

+			
500 Internal Server Error

+			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

+			
+
+		

+	

+

+{% endblock %}

From 32bb85c8e2317465ddb35b326d6819db20a6611e Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:51:49 +0200
Subject: [PATCH 06/11] testing on devrama

---
 files/templates/errors/502.html | 433 +++++++++++++++++++++++++++++++-
 1 file changed, 427 insertions(+), 6 deletions(-)

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index 42db88e68..422228515 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -1,12 +1,327 @@
-{% extends "default.html" %}
 
-{% block title %}
+
+
+
+	
+
+	
+
+	
+		
+	
+
+	
+		
+		
+		
+		
+	
+
+	
+
+	
+
+	
+
+	
+		
+	
+
+	
+	
+
+	
+
+	
+	
 500 Internal Server Error
-{% endblock %}
 
-{% block pagetype %}error-500{% endblock %}
 
-{% block content %}
+	
+	
+	
+	
+
+	
+		
+		
+		
+		
+		
+		
+		
+		
+
+
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+		
+		
+
+		
+
+
+
+
+ 
+
+ 
+
+
+		
+		
+			
+				
+					
+					
+					site banner
+				
+			
+		
+	
+
+
+
+
+
+
+
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+	

+
+		

+
+			
+			
+
+			
+			
+
+			
+			
+
+			
+			
+
+			
 

 	

 		

@@ -19,4 +334,110 @@
 		

 	

 

-{% endblock %}
+
+
+			
+			
+
+		

+		
+			
+		
+	

+

+
+
+	

+
+		
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

From 6da4e16a45b5b699d8f3e8d7782fecc3332e6bbb Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:56:48 +0200
Subject: [PATCH 07/11] cosmetic change

---
 files/templates/errors/502.html | 534 +++++++-------------------------
 1 file changed, 117 insertions(+), 417 deletions(-)

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index 422228515..50e91b76f 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -1,443 +1,143 @@
-
 
 
-
-	
+	
+		
 
-	
+		
 
-	
-		
-	
-
-	
-		
-		
-		
-		
-	
-
-	
-
-	
-
-	
-
-	
 		
-	
+		
+		
 
-	
-	
+		
+		
 
-	
+		
 
-	
-	
-500 Internal Server Error
+		
 
+		500 Internal Server Error
 
-	
-	
-	
-	
+		
+		
+		
+		
 
-	
-		
-		
-		
-		
-		
-		
-		
-		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
 
+	
+		
+			site banner
+		
 
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
+		
 
+		

+			

+				

+					

+						

+							

+								:#marseydead:
+								

+								
500 Internal Server Error

+								

+									Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page
+									but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to
+									fix it. Don't bother them. Thanks ily <3
+								

+								
+							

+						

+					

+				

+			

 		

-	
-
-
-
-			
-			
-
-		
-		
-			
-		
-	
-
-
-
-	

-
-		
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+	
 
\ No newline at end of file

From 5e6fe2e27dbc61e502e47f6a85e913d0bcbb2fdc Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:58:55 +0200
Subject: [PATCH 08/11] testing on devrama

---
 files/routes/front.py           | 1 +
 files/templates/errors/500.html | 2 +-
 files/templates/errors/502.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/routes/front.py b/files/routes/front.py
index 3202436dd..d38c4ab5a 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -197,6 +197,7 @@ def random_post(v):
 @app.get("/random_user")
 @auth_required
 def random_user(v):
+	abort(500)
 
 	u = g.db.query(User.username).filter(User.song != None).order_by(func.random()).first()
 	
diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index 42db88e68..95cb28b76 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -10,7 +10,7 @@
 

 	

 		

-			:#marseydead:
+			:#marseycarp3:
 			

 			
500 Internal Server Error

 			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index 50e91b76f..34ee6e827 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -124,7 +124,7 @@
 					

 						

 							

-								:#marseydead:
+								:#marseycarp3:
 								

 								
500 Internal Server Error

 								


From 3e8c61880490e651635c5b981085c63391422233 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 00:59:38 +0200
Subject: [PATCH 09/11] testing on devrama

---
 files/routes/front.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/files/routes/front.py b/files/routes/front.py
index d38c4ab5a..9c9257e11 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -197,8 +197,6 @@ def random_post(v):
 @app.get("/random_user")
 @auth_required
 def random_user(v):
-	abort(500)
-
 	u = g.db.query(User.username).filter(User.song != None).order_by(func.random()).first()
 	
 	if u: u = u[0]

From ba35765f645361d4123fd292531b4dc0b06b9124 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 01:05:38 +0200
Subject: [PATCH 10/11] cosmetic change

---
 files/templates/errors/500.html | 1 -
 files/templates/errors/502.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index 95cb28b76..8782eb5a6 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -15,7 +15,6 @@
 			
500 Internal Server Error

 			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

 			
-
 		

 	

 

diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index 34ee6e827..e63dc812c 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -132,7 +132,7 @@
 									but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to
 									fix it. Don't bother them. Thanks ily <3
 								

-								
+								
 							

 						

 					


From c27ee0818cafe9f22ec00b87c85ca7c1863224d7 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Tue, 20 Sep 2022 01:08:02 +0200
Subject: [PATCH 11/11] update sample nginx

---
 nginx.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nginx.txt b/nginx.txt
index 8f9c53eb2..aec8278e8 100644
--- a/nginx.txt
+++ b/nginx.txt
@@ -21,4 +21,8 @@ server {
         location /chat {
             proxy_pass http://127.0.0.1:5001/chat;
         }
+        error_page 502 = /error_page/502.html;
+        location /error_page/ {
+            alias /rDrama/files/templates/errors/;
+        }
 }
\ No newline at end of file