opensourcemirror
/
core.sr.ht
mirror of https://git.sr.ht/~sircmpwn/core.sr.ht
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve handling of read-only database errors

This commit is contained in:
Drew DeVault 2020-07-06 11:46:45 -04:00
parent a7f1e30c0c
commit 25dfe511f3
3 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
srht/flask.py
View File

@ -22,15 +22,18 @@ try:
except ImportError:
from werkzeug.middleware.dispatcher import DispatcherMiddleware
import binascii
import hashlib
import inspect
import humanize
import decimal
import bleach
import decimal
import hashlib
import humanize
import inspect
import json
import locale
import sys
import os
import psycopg2.errors
import sqlalchemy.exc
import sqlalchemy.orm.exc
import sys
class NamespacedSession:
def __getitem__(self, key):
@ -251,8 +254,10 @@ class SrhtFlask(Flask):
@self.errorhandler(500)
def handle_500(e):
if self.debug:
raise e
if isinstance(e.original_exception, sqlalchemy.exc.InternalError):
e = e.original_exception.orig
if isinstance(e, psycopg2.errors.ReadOnlySqlTransaction):
return render_template("read_only.html")
# shit
try:
if hasattr(db, 'session'):
@ -272,9 +277,6 @@ class SrhtFlask(Flask):
@self.context_processor
def inject():
from srht.oauth import current_user
user_class = (current_user._get_current_object().__class__
if current_user else None)
root = get_origin(self.site, external=True)
ctx = {
'root': root,
@ -294,11 +296,22 @@ class SrhtFlask(Flask):
'site_name': cfg("sr.ht", "site-name", default=None),
'environment': cfg("sr.ht", "environment", default="production"),
'network': self.get_network(),
'current_user': (user_class.query
.filter(user_class.id == current_user.id)
).one_or_none() if current_user else None,
'static_resource': self.static_resource,
}
try:
from srht.oauth import current_user
user_class = (current_user._get_current_object().__class__
if current_user else None)
ctx = {
**ctx,
'current_user': (user_class.query
.filter(user_class.id == current_user.id)
).one_or_none() if current_user else None,
}
except sqlalchemy.orm.exc.DetachedInstanceError:
pass # Can happen while cleaning up from 500 errors
except sqlalchemy.exc.InvalidRequestError:
pass # Can happen while cleaning up from 500 errors
if self.oauth_service:
ctx.update({
"oauth_url": self.oauth_service.oauth_url(

2
srht/templates/layout.html
View File

@ -19,6 +19,7 @@
{% endblock %}
</head>
<body>
{% block environment %}
{% if environment != "production" or
(current_user and current_user.user_type.value == 'admin' )%}
<div style="
@ -31,6 +32,7 @@
{{environment.upper()}} ENVIRONMENT
</div>
{% endif %}
{% endblock %}
{% block nav %}
<nav class="container navbar navbar-light navbar-expand-sm">
{% include 'nav.html' %}

33
srht/templates/read_only.html Normal file
View File

@ -0,0 +1,33 @@
{% extends "layout.html" %}
{% block nav %}{% endblock %}
{% block environment %}{% endblock %}
{% block body %}
<style>
#warning {
background: repeating-linear-gradient(
45deg,
yellow,
yellow 10px,
#856404 10px,
#856404 20px
);
height: 1rem;
margin-bottom: 1rem;
}
h2 { text-align: center; }
</style>
<div id="warning"></div>
<div class="container">
<h2>{{cfg('sr.ht', 'site-name')}} is currently in read-only mode</h2>
<p>
We are currently operating in read-only mode and cannot process your
request. This usually occurs during planned maintenance or as the result of
an unexpected outage. Consult the
<a href="{{cfg('sr.ht', 'status-page')}}">status page</a> for updates.
This type of issue is usually resolved within a few minutes. You may
refresh this page later to re-attempt your request, or press back to return
to the previous page.
</p>
</div>
{% endblock %}