From 0feb71228aab02b6831034e64dec5c5ec8d691f2 Mon Sep 17 00:00:00 2001
From: Brian Simpson <bsimpson63@gmail.com>
Date: Thu, 16 Jan 2014 17:04:51 -0500
Subject: [PATCH] Delete update_promos_q.

A cron job is sufficient because promote.make_daily_promotions()
is all that needs to be run.
---
 r2/r2/config/queues.py                       |  1 -
 r2/r2/lib/promote.py                         | 38 ++++----------------
 upstart/reddit-consumer-update_promos_q.conf | 14 --------
 3 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 upstart/reddit-consumer-update_promos_q.conf

diff --git a/r2/r2/config/queues.py b/r2/r2/config/queues.py
index a00c5b333..239a54bb0 100644
--- a/r2/r2/config/queues.py
+++ b/r2/r2/config/queues.py
@@ -82,7 +82,6 @@ def declare_queues(g):
         "vote_fastlane_q": MessageQueue(bind_to_self=True),
         "log_q": MessageQueue(bind_to_self=True),
         "cloudsearch_changes": MessageQueue(bind_to_self=True),
-        "update_promos_q": MessageQueue(bind_to_self=True),
         "butler_q": MessageQueue(),
     })
 
diff --git a/r2/r2/lib/promote.py b/r2/r2/lib/promote.py
index 2369fdbad..aaa41877b 100644
--- a/r2/r2/lib/promote.py
+++ b/r2/r2/lib/promote.py
@@ -31,7 +31,6 @@ from pylons import g, c
 from pylons.i18n import ungettext
 
 from r2.lib import (
-    amqp,
     authorize,
     emailer,
     hooks,
@@ -67,10 +66,6 @@ from r2.models import (
 )
 from r2.models.keyvalue import NamedGlobals
 
-
-UPDATE_QUEUE = 'update_promos_q'
-QUEUE_ALL = 'all'
-
 PROMO_HEALTH_KEY = 'promotions_last_updated'
 
 def _mark_promos_updated():
@@ -827,37 +822,16 @@ def get_spent_amount(campaign):
     return spent
 
 
-def Run(offset=0, verbose=True):
+def Run(verbose=True):
     """reddit-job-update_promos: Intended to be run hourly to pull in
     scheduled changes to ads
-    
+
     """
 
     if verbose:
-        print "promote.py:Run() - amqp.add_item()"
-    amqp.add_item(UPDATE_QUEUE, json.dumps(QUEUE_ALL),
-                  delivery_mode=amqp.DELIVERY_TRANSIENT)
-    amqp.worker.join()
+        print "promote.py:Run() - make_daily_promotions()"
+
+    make_daily_promotions()
+
     if verbose:
         print "promote.py:Run() - finished"
-
-
-def run_changed(drain=False, limit=100, sleep_time=10, verbose=True):
-    """reddit-consumer-update_promos: amqp consumer of update_promos_q
-    
-    Handles asynch accepting/rejecting of ads that are scheduled to be live
-    right now
-    
-    """
-    @g.stats.amqp_processor(UPDATE_QUEUE)
-    def _run(msgs, chan):
-        items = [json.loads(msg.body) for msg in msgs]
-        if QUEUE_ALL in items:
-            # QUEUE_ALL is just an indicator to run make_daily_promotions.
-            # There's no promotion log to update in this case.
-            print "Received %s QUEUE_ALL message(s)" % items.count(QUEUE_ALL)
-            items = [i for i in items if i != QUEUE_ALL]
-            make_daily_promotions()
-
-    amqp.handle_items(UPDATE_QUEUE, _run, limit=limit, drain=drain,
-                      sleep_time=sleep_time, verbose=verbose)
diff --git a/upstart/reddit-consumer-update_promos_q.conf b/upstart/reddit-consumer-update_promos_q.conf
deleted file mode 100644
index ab74e56fc..000000000
--- a/upstart/reddit-consumer-update_promos_q.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-description "reject or accept promotions in between the hourly update_promos cron"
-
-instance $x
-
-stop on reddit-stop or runlevel [016]
-
-respawn
-respawn limit 10 5
-
-nice 10
-script
-    . /etc/default/reddit
-    wrap-job paster run --proctitle update_promos_q$x $REDDIT_INI $REDDIT_ROOT/r2/lib/promote.py -c 'run_changed()'
-end script