diff options
| author | Egor Yurtaev <yurtaev.egor@gmail.com> | 2014-12-24 14:00:53 +0600 |
|---|---|---|
| committer | Egor Yurtaev <yurtaev.egor@gmail.com> | 2014-12-25 12:56:50 +0600 |
| commit | 203c67624b7ab566a89ba27a017e26d05ec0e6ff (patch) | |
| tree | 25b1b78de75d7da6a12d83d064625bfbe58b857d | |
| parent | 0d7849d297b62fb52c5b28b52e9b35804b2cbd01 (diff) | |
| download | omaha-server-203c67624b7ab566a89ba27a017e26d05ec0e6ff.zip omaha-server-203c67624b7ab566a89ba27a017e26d05ec0e6ff.tar.gz omaha-server-203c67624b7ab566a89ba27a017e26d05ec0e6ff.tar.bz2 | |
add url to crash view in admin-panel
| -rw-r--r-- | omaha_server/crash/tests/test_utils.py | 6 | ||||
| -rw-r--r-- | omaha_server/crash/utils.py | 4 | ||||
| -rw-r--r-- | omaha_server/omaha_server/settings.py | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/omaha_server/crash/tests/test_utils.py b/omaha_server/crash/tests/test_utils.py index 337caf9..2e406fe 100644 --- a/omaha_server/crash/tests/test_utils.py +++ b/omaha_server/crash/tests/test_utils.py @@ -24,6 +24,7 @@ from mock import patch from django import test from django.core.files.uploadedfile import SimpleUploadedFile +from django.core.urlresolvers import reverse from crash.utils import ( get_stacktrace, @@ -103,12 +104,14 @@ class SignatureTest(test.TestCase): class SendStackTraceTest(test.TestCase): @patch('crash.utils.client') + @test.override_settings(HOST_NAME='example.com') def test_send_stacktrace_sentry(self, mock_client): meta = dict( lang='en', version='1.0.0.1', ) crash = Crash( + pk=123, upload_file_minidump=SimpleUploadedFile('./dump.dat', False), stacktrace=stacktrace, stacktrace_json=parse_stacktrace(stacktrace), @@ -121,6 +124,9 @@ class SendStackTraceTest(test.TestCase): send_stacktrace_sentry(crash) extra = { + 'crash_admin_panel_url': 'http://{}{}'.format( + 'example.com', + reverse('admin:crash_crash_change', args=(crash.pk,))), 'crashdump_url': crash.upload_file_minidump.url, 'lang': 'en', 'version': '1.0.0.1'} diff --git a/omaha_server/crash/utils.py b/omaha_server/crash/utils.py index 0170df7..beac4e8 100644 --- a/omaha_server/crash/utils.py +++ b/omaha_server/crash/utils.py @@ -22,6 +22,7 @@ import os import re from django.conf import settings +from django.core.urlresolvers import reverse from clom import clom from raven import Client @@ -102,6 +103,9 @@ def send_stacktrace_sentry(crash): data['sentry.interfaces.User'] = dict(id=crash.userid) extra = dict( + crash_admin_panel_url='http://{}{}'.format( + settings.HOST_NAME, + reverse('admin:crash_crash_change', args=(crash.pk,))), crashdump_url=crash.upload_file_minidump.url, ) diff --git a/omaha_server/omaha_server/settings.py b/omaha_server/omaha_server/settings.py index 845a73d..9da3915 100644 --- a/omaha_server/omaha_server/settings.py +++ b/omaha_server/omaha_server/settings.py @@ -38,6 +38,8 @@ SUIT_CONFIG = { # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'qicy(##kk%%2%#5zyoz)&0*@2wlfis+6s*al2q3t!+#++(0%23' +HOST_NAME = os.environ['HOST_NAME'] + # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True |