Remove Event.level

src/sentry/manager.py

@@ -269,7 +269,6 @@ class GroupManager(BaseManager):
         platform = data.pop('platform')
 
         kwargs = {
-            'level': level,
             'message': message,
             'platform': platform,
             'culprit': culprit or '',
@@ -293,6 +292,7 @@ class GroupManager(BaseManager):
 
         group_kwargs = kwargs.copy()
         group_kwargs.update({
+            'level': level,
             'last_seen': date,
             'first_seen': date,
             'time_spent_total': time_spent or 0,
@@ -413,8 +413,8 @@ class GroupManager(BaseManager):
             }
             if event.message and event.message != group.message:
                 extra['message'] = event.message
-            if group.level != event.level:
-                extra['level'] = event.level
+            if group.level != kwargs['level']:
+                extra['level'] = kwargs['level']
             if group.culprit != event.culprit:
                 extra['culprit'] = event.culprit
 

src/sentry/models/activity.py

@@ -126,7 +126,7 @@ class Activity(Model):
         if subject_prefix:
             subject_prefix = subject_prefix.rstrip() + ' '
 
-        subject = '%s%s' % (subject_prefix, self.event.get_email_subject())
+        subject = '%s%s' % (subject_prefix, self.group.get_email_subject())
 
         context = {
             'text': self.data['text'],

src/sentry/models/event.py

@@ -5,14 +5,12 @@ sentry.models.event
 :copyright: (c) 2010-2014 by the Sentry Team, see AUTHORS for more details.
 :license: BSD, see LICENSE for more details.
 """
-import logging
-
 from django.db import models
 from django.utils import timezone
 from django.utils.datastructures import SortedDict
 from django.utils.translation import ugettext_lazy as _
 
-from sentry.constants import LOG_LEVELS, MAX_CULPRIT_LENGTH
+from sentry.constants import MAX_CULPRIT_LENGTH
 from sentry.db.models import (
     Model, NodeField, BoundedIntegerField, BoundedPositiveIntegerField,
     BaseManager, sane_repr
@@ -32,9 +30,6 @@ class Event(Model):
     project = models.ForeignKey('sentry.Project', null=True)
     logger = models.CharField(
         max_length=64, blank=True, default='root', db_index=True)
-    level = BoundedPositiveIntegerField(
-        choices=LOG_LEVELS.items(), default=logging.ERROR, blank=True,
-        db_index=True)
     message = models.TextField()
     culprit = models.CharField(
         max_length=MAX_CULPRIT_LENGTH, blank=True, null=True,
@@ -177,7 +172,6 @@ class Event(Model):
         data['checksum'] = self.checksum
         data['project'] = self.project.slug
         data['logger'] = self.logger
-        data['level'] = self.get_level_display()
         data['culprit'] = self.culprit
         data['datetime'] = self.datetime
         data['time_spent'] = self.time_spent
@@ -188,10 +182,3 @@ class Event(Model):
     @property
     def size(self):
         return len(unicode(vars(self)))
-
-    def get_email_subject(self):
-        return '[%s %s] %s: %s' % (
-            self.team.name.encode('utf-8'),
-            self.project.name.encode('utf-8'),
-            unicode(self.get_level_display()).upper().encode('utf-8'),
-            self.error().encode('utf-8').splitlines()[0])

src/sentry/models/group.py

@@ -202,3 +202,11 @@ class Group(Model):
     @property
     def team(self):
         return self.project.team
+
+    def get_email_subject(self):
+        return '[%s %s] %s: %s' % (
+            self.team.name.encode('utf-8'),
+            self.project.name.encode('utf-8'),
+            unicode(self.get_level_display()).upper().encode('utf-8'),
+            self.message_short.encode('utf-8')
+        )

src/sentry/plugins/sentry_mail/models.py

@@ -137,7 +137,7 @@ class MailPlugin(NotificationPlugin):
                 continue
             interface_list.append((interface.get_title(), mark_safe(body)))
 
-        subject = event.get_email_subject()
+        subject = group.get_email_subject()
 
         link = group.get_absolute_url()
 
@@ -153,10 +153,10 @@ class MailPlugin(NotificationPlugin):
         }
 
         headers = {
-            'X-Sentry-Logger': event.logger,
-            'X-Sentry-Logger-Level': event.get_level_display(),
+            'X-Sentry-Logger': group.logger,
+            'X-Sentry-Logger-Level': group.get_level_display(),
             'X-Sentry-Project': project.name,
-            'X-Sentry-Reply-To': group_id_to_email(group.pk),
+            'X-Sentry-Reply-To': group_id_to_email(group.id),
         }
 
         self._send_mail(

tests/fixtures/cleanup.json

@@ -67,7 +67,6 @@
     "fields": {
       "project": 1,
       "group": 2,
-      "level": 30,
       "checksum": "ed77d1185670a58e7242fde014d980e9",
       "datetime": "2010-08-31 17:50:47Z",
       "logger": "root",
@@ -82,7 +81,6 @@
     "fields": {
       "project": 1,
       "group": 3,
-      "level": 40,
       "checksum": "ff554a446687e950d719b0c996f55953",
       "datetime": "2010-08-31 17:53:31Z",
       "logger": "root",
@@ -97,7 +95,6 @@
     "fields": {
       "project": 1,
       "group": 3,
-      "level": 40,
       "checksum": "ff554a446687e950d719b0c996f55953",
       "datetime": "2010-08-31 17:53:31Z",
       "logger": "root",
@@ -112,7 +109,6 @@
     "fields": {
       "project": 1,
       "group": 3,
-      "level": 40,
       "checksum": "ff554a446687e950d719b0c996f55953",
       "datetime": "2010-08-31 17:53:31Z",
       "logger": "root",
@@ -127,7 +123,6 @@
     "fields": {
       "project": 1,
       "group": 4,
-      "level": 40,
       "checksum": "561fd84df24b5ff5c4b24cf3ab757b3b",
       "datetime": "2010-08-31 17:53:53Z",
       "logger": "root",
@@ -142,7 +137,6 @@
     "fields": {
       "project": 1,
       "group": 4,
-      "level": 40,
       "checksum": "561fd84df24b5ff5c4b24cf3ab757b3b",
       "datetime": "2010-08-31 17:53:54Z",
       "logger": "awesome",
@@ -157,7 +151,6 @@
     "fields": {
       "project": 1,
       "group": 4,
-      "level": 40,
       "checksum": "561fd84df24b5ff5c4b24cf3ab757b3b",
       "datetime": "2010-08-31 17:53:54Z",
       "logger": "sentry",
@@ -172,7 +165,6 @@
     "fields": {
       "project": 1,
       "group": 5,
-      "level": 40,
       "checksum": "e27c40cb7b42d2752efc37f4f7ecfb12",
       "datetime": "2010-08-31 17:54:23Z",
       "logger": "pie",
@@ -187,7 +179,6 @@
     "fields": {
       "project": 1,
       "group": 5,
-      "level": 40,
       "checksum": "e27c40cb7b42d2752efc37f4f7ecfb12",
       "datetime": "2010-08-31 17:54:23Z",
       "logger": "root",
@@ -202,7 +193,6 @@
     "fields": {
       "project": 1,
       "group": 5,
-      "level": 40,
       "checksum": "e27c40cb7b42d2752efc37f4f7ecfb12",
       "datetime": "2010-08-31 17:54:24Z",
       "logger": "root",

tests/integration/tests.py

@@ -191,7 +191,6 @@ class SentryRemoteTest(TestCase):
         instance = Event.objects.get()
 
         self.assertEquals(instance.message, 'hello')
-        self.assertEquals(instance.level, 40)
 
     def test_content_encoding_deflate(self):
         kwargs = {'message': 'hello'}

tests/sentry/models/tests.py

@@ -138,8 +138,8 @@ class EventNodeStoreTest(TestCase):
         data = {'key': 'value'}
 
         query_bits = [
-            "INSERT INTO sentry_message (group_id, project_id, data, logger, level, message, checksum, datetime)",
-            "VALUES(%s, %s, %s, '', 0, %s, %s, %s)",
+            "INSERT INTO sentry_message (group_id, project_id, data, logger, message, checksum, datetime)",
+            "VALUES(%s, %s, %s, '', %s, %s, %s)",
         ]
         params = [group.id, group.project_id, compress(pickle.dumps(data)), 'test', 'a' * 32, timezone.now()]
 

tests/sentry/plugins/mail/tests.py

@@ -109,12 +109,13 @@ class MailPluginTest(TestCase):
             first_seen=timezone.now(),
             last_seen=timezone.now(),
             project=self.project,
+            message='hello world',
+            logger='root',
         )
 
         event = Event(
             group=group,
-            message='hello world',
-            logger='root',
+            message=group.message,
             project=self.project,
             datetime=group.last_seen,
         )
@@ -137,11 +138,12 @@ class MailPluginTest(TestCase):
             first_seen=timezone.now(),
             last_seen=timezone.now(),
             project=self.project,
+            message='hello world\nfoo bar',
         )
 
         event = Event(
             group=group,
-            message='hello world\nfoo bar',
+            message=group.message,
             logger='root',
             project=self.project,
             datetime=group.last_seen,