← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/jobs/lp.py

  • Committer: Tarmac
  • Author(s): Benji York
  • Date: 2013-07-22 17:57:14 UTC
  • mfrom: (317.2.15 even-more-bundles)
  • Revision ID: tarmac-20130722175714-zc4altyt3t9dwmuu
[r=abentley][bug=][author=benji] Make the queue worker process the basket queue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmworld/jobs/lp.py
131
131
    try:
132
132
        lease_time = int(settings['script_lease_time']) * 60
133
133
        with lock('ingest-queue', lease_time, db, log):
134
 
            queue = get_queue(CHARM_QUEUE)
 
134
            queue = get_queue(db, CHARM_QUEUE)
135
135
            queue_size = queue.size()
136
136
            queue.clear()
137
137
            log.info("Dequeued %s charms", queue_size)
139
139
        log.warn(str(error))
140
140
 
141
141
 
 
142
# XXX bug=1130732: This function does not appear to be tested.
142
143
def main():
143
144
    configure_logging()
144
145
    parser = argparse.ArgumentParser()
164
165
    try:
165
166
        with lock('ingest-queue', int(settings['script_lease_time']) * 60,
166
167
                  db, log):
167
 
            charm_queue = get_queue(CHARM_QUEUE)
168
 
            basket_queue = get_queue(BASKET_QUEUE)
 
168
            charm_queue = get_queue(db, CHARM_QUEUE)
 
169
            basket_queue = get_queue(db, BASKET_QUEUE)
169
170
            queue_from_branches(db, charm_queue, basket_queue,
170
171
                                charm_import_limit, args.prefix)
171
172
    except LockHeld, error: