summaryrefslogtreecommitdiff
path: root/python/pgq/localconsumer.py
diff options
context:
space:
mode:
authorMarko Kreen2012-11-02 09:56:56 +0000
committerMarko Kreen2012-11-02 09:56:56 +0000
commitab4ac0cd39b2a75eaabeb43dafa5f4ee3757500c (patch)
tree2fb3d5989641f3ba2ea3075ddc61952601c8b0eb /python/pgq/localconsumer.py
parent858cb7c48a67afcb4603f4f3a710e278b88e7a52 (diff)
parentfddcbe19e1623e585f85610cecff50c00f26d228 (diff)
Merge remote-tracking branch 'intgit/master'
Diffstat (limited to 'python/pgq/localconsumer.py')
-rw-r--r--python/pgq/localconsumer.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/python/pgq/localconsumer.py b/python/pgq/localconsumer.py
index 8cee2cc3..5ba74453 100644
--- a/python/pgq/localconsumer.py
+++ b/python/pgq/localconsumer.py
@@ -26,7 +26,7 @@ class LocalConsumer(pgq.Consumer):
Features:
- Can detect if several batches are already applied to dest db.
- - If some ticks are lost. allows to seek back on queue.
+ - If some ticks are lost, allows to seek back on queue.
Whether it succeeds, depends on pgq configuration.
Config options::
@@ -84,7 +84,7 @@ class LocalConsumer(pgq.Consumer):
q = "select * from pgq.register_consumer(%s, %s)"
curs.execute(q, [self.queue_name, self.consumer_name])
elif local_tick < 0:
- self.log.info("Local tick missing, storing queueu tick %d", queue_tick)
+ self.log.info("Local tick missing, storing queue tick %d", queue_tick)
self.save_local_tick(queue_tick)
elif local_tick > queue_tick:
self.log.warning("Tracking out of sync: queue=%d local=%d. Repositioning on queue. [Database failure?]",
@@ -177,14 +177,14 @@ class LocalConsumer(pgq.Consumer):
src_db = self.get_database(self.db_name)
src_curs = src_db.cursor()
- self.log.info("Rewinding queue to tick local tick %d", dst_tick)
+ self.log.info("Rewinding queue to local tick %d", dst_tick)
q = "select pgq.register_consumer_at(%s, %s, %s)"
src_curs.execute(q, [self.queue_name, self.consumer_name, dst_tick])
src_db.commit()
else:
self.log.error('Cannot rewind, no tick found in local file')
-
+
def dst_reset(self):
self.log.info("Removing local tracking file")
try:
@@ -213,4 +213,3 @@ class LocalConsumer(pgq.Consumer):
"""Store tick in local file."""
data = str(tick_id)
skytools.write_atomic(self.local_tracking_file, data)
-