| {"repo": "City-of-Helsinki/respa", "pull_number": 587, "instance_id": "City-of-Helsinki__respa-587", "issue_numbers": "", "base_commit": "d509424d79dc29954b9a717f124c5224227af02f", "patch": "diff --git a/resources/importer/kirjastot.py b/resources/importer/kirjastot.py\n--- a/resources/importer/kirjastot.py\n+++ b/resources/importer/kirjastot.py\n@@ -3,7 +3,7 @@\n import requests\n from django.conf import settings\n from django.db import transaction\n-from raven import Client\n+from sentry_sdk import capture_message\n from resources.models import Unit\n from typing import Dict, List\n from .base import Importer, register_importer\n@@ -59,10 +59,9 @@ def process_varaamo_libraries():\n problems.append(\" \".join([\"Failed data fetch on library: \", str(varaamo_unit)]))\n \n try:\n- if problems and settings.RAVEN_DSN:\n- # Report problems to Raven/Sentry\n- client = Client(settings.RAVEN_DSN)\n- client.captureMessage(\"\\n\".join(problems))\n+ if problems:\n+ # without Sentry, this will gracefully file the message to /dev/null\n+ capture_message(\"\\n\".join(problems))\n except AttributeError:\n pass\n \ndiff --git a/resources/importer/kirjastot_v2.py b/resources/importer/kirjastot_v2.py\n--- a/resources/importer/kirjastot_v2.py\n+++ b/resources/importer/kirjastot_v2.py\n@@ -12,7 +12,7 @@\n from resources.models import Unit, UnitIdentifier\n from .base import Importer, register_importer\n \n-from raven import Client\n+from sentry_sdk import capture_message\n \n from django.conf import settings\n \n@@ -72,13 +72,9 @@ def process_varaamo_libraries():\n print(\"Failed data fetch on library: \", varaamo_unit)\n problems.append(\" \".join([\"Failed data fetch on library: \", str(varaamo_unit)]))\n \n- try:\n- if problems and settings.RAVEN_DSN:\n- # Report problems to Raven/Sentry\n- client = Client(settings.RAVEN_DSN)\n- client.captureMessage(\"\\n\".join(problems))\n- except AttributeError:\n- pass\n+ # report problems to Sentry (will fail silently if not available)\n+ if problems:\n+ capture_message(\"\\n\".join(problems))\n \n \n @transaction.atomic\ndiff --git a/respa/settings.py b/respa/settings.py\n--- a/respa/settings.py\n+++ b/respa/settings.py\n@@ -2,15 +2,42 @@\n Django settings for respa project.\n \"\"\"\n \n-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\n import os\n+import subprocess\n import environ\n-import raven\n+import sentry_sdk\n+from sentry_sdk.integrations.django import DjangoIntegration\n from django.utils.translation import ugettext_lazy as _\n from django.core.exceptions import ImproperlyConfigured\n \n-\n root = environ.Path(__file__) - 2 # two folders back\n+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\n+BASE_DIR = root()\n+\n+# Location of the fallback version file, used when no repository is available.\n+# This is hardcoded as reading it from configuration does not really make\n+# sense. It is supposed to be a fallback after all.\n+VERSION_FILE = os.path.join(BASE_DIR, '../service_state/deployed_version')\n+\n+def get_git_revision_hash():\n+ \"\"\"\n+ We need a way to retrieve git revision hash for sentry reports\n+ \"\"\"\n+ try:\n+ # We are not interested in gits complaints, stderr -> null\n+ git_hash = subprocess.check_output(['git', 'describe', '--tags', '--long', '--always'], stderr=subprocess.DEVNULL, encoding='utf8')\n+ # First is \"git not found\", second is most likely \"no repository\"\n+ except (FileNotFoundError, subprocess.CalledProcessError):\n+ try:\n+ # fall back to hardcoded file location\n+ with open(VERSION_FILE) as f:\n+ git_hash = f.readline()\n+ except FileNotFoundError:\n+ git_hash = \"revision_not_available\"\n+\n+ return git_hash.rstrip()\n+\n+\n env = environ.Env(\n DEBUG=(bool, False),\n SECRET_KEY=(str, ''),\n@@ -47,8 +74,6 @@\n # reservation confirmation emails use this\n RESPA_IMAGE_BASE_URL = env('RESPA_IMAGE_BASE_URL')\n \n-BASE_DIR = root()\n-\n DEBUG_TOOLBAR_CONFIG = {\n 'RESULTS_CACHE_SIZE': 100,\n }\n@@ -117,12 +142,12 @@\n ]\n \n if env('SENTRY_DSN'):\n- RAVEN_CONFIG = {\n- 'dsn': env('SENTRY_DSN'),\n- 'environment': env('SENTRY_ENVIRONMENT'),\n- 'release': raven.fetch_git_sha(BASE_DIR),\n- }\n- INSTALLED_APPS.append('raven.contrib.django.raven_compat')\n+ sentry_sdk.init(\n+ dsn=env('SENTRY_DSN'),\n+ environment=env('SENTRY_ENVIRONMENT'),\n+ release=get_git_revision_hash(),\n+ integrations=[DjangoIntegration()]\n+ )\n \n MIDDLEWARE = [\n 'django.middleware.security.SecurityMiddleware',\ndiff --git a/respa_exchange/management/base.py b/respa_exchange/management/base.py\n--- a/respa_exchange/management/base.py\n+++ b/respa_exchange/management/base.py\n@@ -39,14 +39,6 @@ def configure_logging(logger=\"respa_exchange\", level=logging.INFO, handler=None)\n datefmt=logging.Formatter.default_time_format\n ))\n logger.addHandler(handler)\n- if hasattr(settings, 'RAVEN_CONFIG') and 'dsn' in settings.RAVEN_CONFIG:\n- from raven.handlers.logging import SentryHandler\n- from raven.conf import setup_logging\n-\n- sentry_handler = SentryHandler(settings.RAVEN_CONFIG['dsn'])\n- sentry_handler.setLevel(logging.ERROR)\n- logger.addHandler(sentry_handler)\n- setup_logging(sentry_handler)\n \n \n def select_resources(resources, selected_resources):\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2019-06-12T09:23:58Z"} | |