这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Change email notifier subject line #11

Merged
merged 4 commits into from
Oct 29, 2014
+133 −3
Merged

Change email notifier subject line #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fadc44
Append the incident ID to email subject lines
Oct 29, 2014
82b47b4
Remove stray print
Oct 29, 2014
d22e073
Increase incident description field to 200 chars
Oct 29, 2014
c4d5cbf
Configurable email subject truncation
Oct 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions notification/notifier/email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
__author__ = 'deathowl'

import smtplib
from django.template.defaultfilters import truncatechars

class EmailNotifier:
def __init__(self, config):
Expand All @@ -9,9 +10,12 @@ def notify(self, notification):

gmail_user = self.__config['user']
gmail_pwd = self.__config['password']
truncate_length = int(self.__config.get('max_subject_length', 100))
FROM = self.__config['user']
TO = [notification.user_to_notify.email]
SUBJECT = "Openduty Incident Report"
SUBJECT = "Openduty Incident Report - {0}".format(notification.incident.description)
if truncate_length:
SUBJECT = truncatechars(SUBJECT, truncate_length)
TEXT = notification.message
message = """\From: %s\nTo: %s\nSubject: %s\n\n%s
""" % (FROM, ", ".join(TO), SUBJECT, TEXT)
Expand All @@ -24,4 +28,4 @@ def notify(self, notification):
server.close()
print 'successfully sent the mail'
except:
print "failed to send mail"
print "failed to send mail"
126 changes: 126 additions & 0 deletions openduty/migrations/0004_auto__chg_field_incident_description.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models


class Migration(SchemaMigration):

def forwards(self, orm):

# Changing field 'Incident.description'
db.alter_column(u'openduty_incident', 'description', self.gf('django.db.models.fields.CharField')(max_length=200))

def backwards(self, orm):

# Changing field 'Incident.description'
db.alter_column(u'openduty_incident', 'description', self.gf('django.db.models.fields.CharField')(max_length=100))

models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'openduty.eventlog': {
'Meta': {'object_name': 'EventLog'},
'data': ('django.db.models.fields.TextField', [], {}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'occurred_at': ('django.db.models.fields.DateTimeField', [], {}),
'service_key': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['openduty.Service']"})
},
u'openduty.incident': {
'Meta': {'unique_together': "(('service_key', 'incident_key'),)", 'object_name': 'Incident'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
'details': ('django.db.models.fields.TextField', [], {}),
'event_type': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'incident_key': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
'occurred_at': ('django.db.models.fields.DateTimeField', [], {}),
'service_key': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['openduty.Service']"})
},
u'openduty.schedulepolicy': {
'Meta': {'object_name': 'SchedulePolicy'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'repeat_times': ('django.db.models.fields.IntegerField', [], {})
},
u'openduty.schedulepolicyrule': {
'Meta': {'object_name': 'SchedulePolicyRule'},
'escalate_after': ('django.db.models.fields.IntegerField', [], {}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'position': ('django.db.models.fields.IntegerField', [], {}),
'schedule': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Calendar']", 'null': 'True', 'blank': 'True'}),
'schedule_policy': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rules'", 'to': u"orm['openduty.SchedulePolicy']"}),
'user_id': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
},
u'openduty.service': {
'Meta': {'object_name': 'Service'},
'escalate_after': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'id': ('uuidfield.fields.UUIDField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'policy': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['openduty.SchedulePolicy']", 'null': 'True', 'blank': 'True'}),
'retry': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
u'openduty.servicetokens': {
'Meta': {'object_name': 'ServiceTokens'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
'service_id': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['openduty.Service']"}),
'token_id': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['openduty.Token']"})
},
u'openduty.token': {
'Meta': {'object_name': 'Token'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'})
},
u'openduty.userprofile': {
'Meta': {'object_name': 'UserProfile'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'pushover_app_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'pushover_user_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'slack_room_name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': u"orm['auth.User']"})
},
'schedule.calendar': {
'Meta': {'object_name': 'Calendar'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
'slug': ('django.db.models.fields.SlugField', [], {'max_length': '200'})
}
}

complete_apps = ['openduty']
2 changes: 1 addition & 1 deletion openduty/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class Incident(models.Model):
service_key = models.ForeignKey(Service)
incident_key = models.CharField(max_length=200)
event_type = models.CharField(max_length=15)
description = models.CharField(max_length=100)
description = models.CharField(max_length=200)
details = models.TextField()
occurred_at = models.DateTimeField()

Expand Down