summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormartinko2013-08-09 14:03:34 +0000
committermartinko2013-08-09 14:03:34 +0000
commit49ac8090682a5d76b577eeade3e29c9e4d83650c (patch)
tree0bd7141f24ccaa9cdaf2120006263bfe47d4f36a /scripts
parentaae5c5b1dde3e456189cdff0fa1cd7b5cb369aa8 (diff)
parent344d063d4e61bdd382d9e1977964fa1fe6363991 (diff)
Merge branch 'release/skytools_3_1_5'skytools_3_1_5
Diffstat (limited to 'scripts')
-rw-r--r--scripts/data_maintainer.py4
-rwxr-xr-xscripts/simple_local_consumer.py6
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/data_maintainer.py b/scripts/data_maintainer.py
index 0c2c48b0..5bd8cd87 100644
--- a/scripts/data_maintainer.py
+++ b/scripts/data_maintainer.py
@@ -7,7 +7,7 @@ either one by one or in batches.
Config template::
- [data_maintainer]
+ [data_maintainer3]
job_name = dm_remove_expired_services
dbread = dbname=sourcedb_test
@@ -81,7 +81,7 @@ class DataMaintainer (skytools.DBScript):
loop_delay = -1
def __init__(self, args):
- super(DataMaintainer, self).__init__("data_maintainer", args)
+ super(DataMaintainer, self).__init__("data_maintainer3", args)
# query for fetching the PK-s of the data set to be maintained
self.sql_pk = self.cf.get("sql_get_pk_list")
diff --git a/scripts/simple_local_consumer.py b/scripts/simple_local_consumer.py
index 1c8f97dd..87c65868 100755
--- a/scripts/simple_local_consumer.py
+++ b/scripts/simple_local_consumer.py
@@ -13,6 +13,10 @@ Config::
# query to call
dst_query = select * from somefunc(%%(pgq.ev_data)s);
+
+ ## Use table_filter where possible instead of this ##
+ # filter for events (SQL fragment)
+ consumer_filter = ev_extra1 = 'public.mytable1'
"""
@@ -30,6 +34,8 @@ class SimpleLocalConsumer(pgq.LocalConsumer):
def reload(self):
super(SimpleLocalConsumer, self).reload()
self.dst_query = self.cf.get("dst_query")
+ if self.cf.get("consumer_filter", ""):
+ self.consumer_filter = self.cf.get("consumer_filter", "")
def process_local_event(self, db, batch_id, ev):
curs = self.get_database('dst_db', autocommit = 1).cursor()