From bbaf880f3a33a19f9af42e4b7157f2dd3a219c57 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Tue, 3 Apr 2007 11:41:13 +0000 Subject: [PATCH] convert Syncer to new API (untested...) --- doc/TODO.txt | 1 + python/londiste/syncer.py | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/doc/TODO.txt b/doc/TODO.txt index efc8a54e..12f17b23 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -14,6 +14,7 @@ Immidiate * londiste swithcover support / deny triggers * deb: /etc/skylog.ini should be conffile * RemoteConsumer/SerialConsumer/pgq_ext sanity, too much duplication +* londiste * remove tbl should work also if table is already dropped Near future ============ diff --git a/python/londiste/syncer.py b/python/londiste/syncer.py index eaee3468..6e1f2ce6 100644 --- a/python/londiste/syncer.py +++ b/python/londiste/syncer.py @@ -26,14 +26,11 @@ class Syncer(skytools.DBScript): src_curs = src_db.cursor() # before locking anything check if consumer is working ok - q = "select extract(epoch from ticker_lag) from pgq.get_queue_list()"\ - " where queue_name = %s" + q = "select extract(epoch from ticker_lag) from pgq.get_queue_info(%s)" src_curs.execute(q, [self.pgq_queue_name]) ticker_lag = src_curs.fetchone()[0] q = "select extract(epoch from lag)"\ - " from pgq.get_consumer_list()"\ - " where queue_name = %s"\ - " and consumer_name = %s" + " from pgq.get_consumer_info(%s, %s)" src_curs.execute(q, [self.pgq_queue_name, self.pgq_consumer_id]) res = src_curs.fetchall() src_db.commit() @@ -129,11 +126,9 @@ class Syncer(skytools.DBScript): while 1: time.sleep(0.2) - q = """select now() - lag > %s, now(), lag - from pgq.get_consumer_list() - where consumer_name = %s - and queue_name = %s""" - src_curs.execute(q, [tpos, self.pgq_consumer_id, self.pgq_queue_name]) + q = "select now() - lag > %s, now(), lag"\ + " from pgq.get_consumer_info(%s, %s)" + src_curs.execute(q, [tpos, self.pgq_queue_name, self.pgq_consumer_id]) res = src_curs.fetchall() src_db.commit() -- 2.39.5