aboutsummaryrefslogtreecommitdiffstats
path: root/python/fatcat_web
diff options
context:
space:
mode:
Diffstat (limited to 'python/fatcat_web')
-rw-r--r--python/fatcat_web/__init__.py7
-rw-r--r--python/fatcat_web/web_config.py13
2 files changed, 14 insertions, 6 deletions
diff --git a/python/fatcat_web/__init__.py b/python/fatcat_web/__init__.py
index 5cb56d0b..70f8ad4a 100644
--- a/python/fatcat_web/__init__.py
+++ b/python/fatcat_web/__init__.py
@@ -3,6 +3,7 @@ from typing import Any
import elasticsearch
import fatcat_openapi_client
+import sentry_sdk
from authlib.flask.client import OAuth
from flask import Flask
from flask.logging import create_logger
@@ -13,7 +14,7 @@ from flask_mwoauth import MWOAuth
from flask_uuid import FlaskUUID
from flask_wtf.csrf import CSRFProtect
from loginpass import GitHub, Gitlab, ORCiD, create_flask_blueprint
-from raven.contrib.flask import Sentry
+from sentry_sdk.integrations.flask import FlaskIntegration
from fatcat_web.types import AnyResponse
from fatcat_web.web_config import Config
@@ -44,7 +45,7 @@ login_manager.login_view = "/auth/login"
oauth = OAuth(app)
# Grabs sentry config from SENTRY_DSN environment variable
-sentry = Sentry(app)
+sentry_sdk.init(integrations=[FlaskIntegration()])
conf = fatcat_openapi_client.Configuration()
conf.host = Config.FATCAT_API_HOST
@@ -81,7 +82,7 @@ mwoauth = MWOAuth(
mwoauth.handshaker.user_agent = "fatcat.wiki;python_web_interface"
app.register_blueprint(mwoauth.bp, url_prefix="/auth/wikipedia")
-app.es_client = elasticsearch.Elasticsearch(Config.ELASTICSEARCH_BACKEND)
+app.es_client = elasticsearch.Elasticsearch(Config.ELASTICSEARCH_BACKEND, timeout=40.0)
from fatcat_web import auth, cors, editing_routes, forms, ref_routes, routes
diff --git a/python/fatcat_web/web_config.py b/python/fatcat_web/web_config.py
index 82525487..55d233f3 100644
--- a/python/fatcat_web/web_config.py
+++ b/python/fatcat_web/web_config.py
@@ -12,8 +12,6 @@ import os
import subprocess
from typing import Union
-import raven
-
basedir = os.path.abspath(os.path.dirname(__file__))
@@ -45,6 +43,15 @@ def test_bool_str() -> None:
assert bool_str("FALSE") is False
+def fetch_git_sha():
+ """
+ Get short commit id, runnable anywhere within a git repository.
+ """
+ return (
+ subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode("ascii").strip()
+ )
+
+
class Config(object):
GIT_REVISION = (
subprocess.check_output(["git", "describe", "--tags", "--long", "--always"])
@@ -137,7 +144,7 @@ class Config(object):
PERMANENT_SESSION_LIFETIME = 2678400 # 31 days, in seconds
try:
- GIT_RELEASE = raven.fetch_git_sha("..")
+ GIT_RELEASE = fetch_git_sha()
except Exception as e:
print("WARNING: couldn't set sentry git release automatically: " + str(e))
GIT_RELEASE = None