Removed CELERY_USING hack.

pculture · May 28, 2013 · 4ffa79f · 4ffa79f
1 parent be5d454
commit 4ffa79f
Show file tree

Hide file tree

Showing 16 changed files with 162 additions and 253 deletions.
diff --git a/localtv/admin/forms.py b/localtv/admin/forms.py
@@ -21,7 +21,7 @@
 
 from localtv import models, utils
 from localtv.settings import API_KEYS
-from localtv.tasks import video_save_thumbnail, feed_update, CELERY_USING
+from localtv.tasks import video_save_thumbnail, feed_update
 from localtv.user_profile import forms as user_profile_forms
 
 from vidscraper import auto_feed
@@ -66,8 +66,7 @@ def save(self, commit=True):
             if (thumbnail_url and not
                 models.Video.objects.get(id=self.instance.id).thumbnail_url == thumbnail_url):
                 self.instance.thumbnail_url = thumbnail_url
-                video_save_thumbnail.delay(self.instance.pk,
-                                           using=CELERY_USING)
+                video_save_thumbnail.delay(self.instance.pk)
         return forms.ModelForm.save(self, commit=commit)
 
 
@@ -1002,7 +1001,6 @@ def save(self, commit=True):
         self.instance.name = self.instance.feed_url
         instance = super(AddFeedForm, self).save(commit)
         feed_update.delay(instance.pk,
-                          using=CELERY_USING,
                           clear_rejected=True)
         return instance
 

diff --git a/localtv/management/commands/update_popularity.py b/localtv/management/commands/update_popularity.py
@@ -18,10 +18,9 @@ def handle(self, **options):
             return
 
         since = options['since']
-        from localtv.tasks import haystack_batch_update, CELERY_USING
+        from localtv.tasks import haystack_batch_update
 
         haystack_batch_update.delay(Video._meta.app_label,
                                     Video._meta.module_name,
                                     start=datetime.now() - timedelta(since),
-                                    date_lookup='watch__timestamp',
-                                    using=CELERY_USING)
+                                    date_lookup='watch__timestamp')
diff --git a/localtv/management/commands/update_sources.py b/localtv/management/commands/update_sources.py
@@ -7,6 +7,6 @@ def handle_noargs(self, **options):
         if site_too_old():
             return
 
-        from localtv.tasks import update_sources, CELERY_USING
-        
-        update_sources.delay(using=CELERY_USING)
+        from localtv.tasks import update_sources
+
+        update_sources.delay()