- bring londiste.ini up to date

- bring londiste help message more up to date
- add --help hint for DBScript start error msg
- bump pgq version to 3.0devel

diff --git a/python/conf/londiste.ini b/python/conf/londiste.ini
index 7be8390ecd3a8634587f06988b5b21898d0aa1a4..710b1c9381c0059ee1833346d90dbf0ff473385f 100644 (file)
--- a/python/conf/londiste.ini
+++ b/python/conf/londiste.ini
@@ -2,9 +2,9 @@
 [londiste]
 job_name = somedb_worker
 
-node_db = dbname=somedb host=127.0.0.1
+db = dbname=somedb host=127.0.0.1
 
-set_name = some_set
+queue_name = some_queue
 
 logfile = ~/log/%(job_name)s.log
 pidfile = ~/pid/%(job_name)s.pid

diff --git a/python/londiste.py b/python/londiste.py
index 62f434e9ed8c1f104f790a1cfb537ac3165bb8ab..48e591ed1aca6b4886f205d1ffed0692da65eb7d 100755 (executable)
--- a/python/londiste.py
+++ b/python/londiste.py
@@ -17,8 +17,8 @@ Replication Daemon:
   worker                replay events to subscriber
 
 Replication Administration:
-  add TBL ...           add table to queue
-  remove TBL ...        remove table from queue
+  add-table TBL ...     add table to queue
+  remove-table TBL ...  remove table from queue
   add-seq SEQ ...       add sequence to provider
   remove-seq SEQ ...    remove sequence from provider
   tables                show all tables on provider

diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index 4d45107fe5c0e1d398dbcbebd9c8317dab5ee9b0..20a6e3fd92237940ba0017d918e8205c9ec88eca 100644 (file)
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -302,7 +302,7 @@ class DBScript(object):
         if self.options.verbose:
             self.log_level = logging.DEBUG
         if len(self.args) < 1:
-            print("need config file")
+            print("need config file, use --help for help.")
             sys.exit(1)
 
         # read config file

diff --git a/sql/pgq/functions/pgq.version.sql b/sql/pgq/functions/pgq.version.sql
index 3c2445fe670f86dacfc95bb3a59b7f6d663e4341..7aa21604ce900d5e70dc044f00f99de251c31e4a 100644 (file)
--- a/sql/pgq/functions/pgq.version.sql
+++ b/sql/pgq/functions/pgq.version.sql
@@ -7,7 +7,7 @@ returns text as $$
 --      that is only bumped when PGQ database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '2.1.5';
+    return '3.0devel';
 end;
 $$ language plpgsql;