Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"Locked" attribute to NoticeType, to restrict which NoticeTypes can be enabled/disabled by the user on the settings page #56

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

"Locked" attribute to NoticeType, to restrict which NoticeTypes can be enabled/disabled by the user on the settings page #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
273396a
added locked attr to NoticeType object, preventing user from disablin…
luismmontielg Jul 9, 2012
b75a36f
Fix to prevent re-sending notification to users when sending batch fails
luismmontielg Nov 24, 2012
f4752c7
Merge branch 'retry-fix'
luismmontielg Nov 24, 2012
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
2 changes: 1 addition & 1 deletion notification/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


class NoticeTypeAdmin(admin.ModelAdmin):
list_display = ["label", "display", "description", "default"]
list_display = ["label", "display", "description", "default", "locked"]


class NoticeSettingAdmin(admin.ModelAdmin):
Expand Down
20 changes: 15 additions & 5 deletions notification/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

def send_all():
lock = FileLock("send_notices")

logging.debug("acquiring lock...")
try:
lock.acquire(LOCK_WAIT_TIMEOUT)
Expand All @@ -36,10 +36,10 @@ def send_all():
logging.debug("waiting for the lock timed out. quitting.")
return
logging.debug("acquired.")
batches, sent = 0, 0

batches, sent, tried = 0, 0, 0
start_time = time.time()

try:
# nesting the try statement to be Python 2.4
try:
Expand All @@ -52,12 +52,22 @@ def send_all():
# call this once per user to be atomic and allow for logging to
# accurately show how long each takes.
notification.send_now([user], label, extra_context, on_site, sender)
tried = tried + 1
except User.DoesNotExist:
tried = tried + 1
# Ignore deleted users, just warn about them
logging.warning("not emitting notice %s to user %s since it does not exist" % (label, user))
except Exception as e:
logging.critical("Error while sending email to user: %s. Notification: %s" % (user, label))
logging.critical("Exception: %s" % e.value)
logging.critical("Updating NoticeQueueBatch object to avoid re-sending to same users...")
queued_batch.pickled_data = pickle.dumps(notices[tried:]).encode("base64")
queued_batch.save()
raise e
sent += 1
queued_batch.delete()
batches += 1
tried = 0
except:
# get the exception
exc_class, e, t = sys.exc_info()
Expand All @@ -72,7 +82,7 @@ def send_all():
logging.debug("releasing lock...")
lock.release()
logging.debug("released.")

logging.info("")
logging.info("%s batches, %s sent" % (batches, sent,))
logging.info("done in %.2f seconds" % (time.time() - start_time))
171 changes: 171 additions & 0 deletions notification/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

class Migration(SchemaMigration):

def forwards(self, orm):

# Adding model 'NoticeType'
db.create_table('notification_noticetype', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(max_length=40)),
('display', self.gf('django.db.models.fields.CharField')(max_length=50)),
('description', self.gf('django.db.models.fields.CharField')(max_length=100)),
('default', self.gf('django.db.models.fields.IntegerField')()),
))
db.send_create_signal('notification', ['NoticeType'])

# Adding model 'NoticeSetting'
db.create_table('notification_noticesetting', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
('notice_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['notification.NoticeType'])),
('medium', self.gf('django.db.models.fields.CharField')(max_length=1)),
('send', self.gf('django.db.models.fields.BooleanField')(default=False)),
))
db.send_create_signal('notification', ['NoticeSetting'])

# Adding unique constraint on 'NoticeSetting', fields ['user', 'notice_type', 'medium']
db.create_unique('notification_noticesetting', ['user_id', 'notice_type_id', 'medium'])

# Adding model 'Notice'
db.create_table('notification_notice', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('recipient', self.gf('django.db.models.fields.related.ForeignKey')(related_name='recieved_notices', to=orm['auth.User'])),
('sender', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sent_notices', null=True, to=orm['auth.User'])),
('message', self.gf('django.db.models.fields.TextField')()),
('notice_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['notification.NoticeType'])),
('added', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
('unseen', self.gf('django.db.models.fields.BooleanField')(default=True)),
('archived', self.gf('django.db.models.fields.BooleanField')(default=False)),
('on_site', self.gf('django.db.models.fields.BooleanField')(default=False)),
))
db.send_create_signal('notification', ['Notice'])

# Adding model 'NoticeQueueBatch'
db.create_table('notification_noticequeuebatch', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('pickled_data', self.gf('django.db.models.fields.TextField')()),
))
db.send_create_signal('notification', ['NoticeQueueBatch'])

# Adding model 'ObservedItem'
db.create_table('notification_observeditem', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
('notice_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['notification.NoticeType'])),
('added', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
('signal', self.gf('django.db.models.fields.TextField')()),
))
db.send_create_signal('notification', ['ObservedItem'])


def backwards(self, orm):

# Removing unique constraint on 'NoticeSetting', fields ['user', 'notice_type', 'medium']
db.delete_unique('notification_noticesetting', ['user_id', 'notice_type_id', 'medium'])

# Deleting model 'NoticeType'
db.delete_table('notification_noticetype')

# Deleting model 'NoticeSetting'
db.delete_table('notification_noticesetting')

# Deleting model 'Notice'
db.delete_table('notification_notice')

# Deleting model 'NoticeQueueBatch'
db.delete_table('notification_noticequeuebatch')

# Deleting model 'ObservedItem'
db.delete_table('notification_observeditem')


models = {
'auth.group': {
'Meta': {'object_name': 'Group'},
'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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
'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'}),
'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'})
},
'notification.notice': {
'Meta': {'ordering': "['-added']", 'object_name': 'Notice'},
'added': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'archived': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'message': ('django.db.models.fields.TextField', [], {}),
'notice_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notification.NoticeType']"}),
'on_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'recieved_notices'", 'to': "orm['auth.User']"}),
'sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sent_notices'", 'null': 'True', 'to': "orm['auth.User']"}),
'unseen': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
},
'notification.noticequeuebatch': {
'Meta': {'object_name': 'NoticeQueueBatch'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'pickled_data': ('django.db.models.fields.TextField', [], {})
},
'notification.noticesetting': {
'Meta': {'unique_together': "(('user', 'notice_type', 'medium'),)", 'object_name': 'NoticeSetting'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'medium': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
'notice_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notification.NoticeType']"}),
'send': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
},
'notification.noticetype': {
'Meta': {'object_name': 'NoticeType'},
'default': ('django.db.models.fields.IntegerField', [], {}),
'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'display': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'max_length': '40'})
},
'notification.observeditem': {
'Meta': {'ordering': "['-added']", 'object_name': 'ObservedItem'},
'added': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'notice_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notification.NoticeType']"}),
'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
'signal': ('django.db.models.fields.TextField', [], {}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
}
}

complete_apps = ['notification']
Loading