pgq_node, londiste: improve log messages from db

londiste.global_add_table()
londiste.global_remove_table()
pgq_node.set_global_watermark()

 - Replace 'Ok' with actual sentence

londiste.root_check_seqs():
 - improved message, downgrade to debug level

pgq_node.set_subscriber_watermark():
 - improve message
 - check tick value sanity

diff --git a/sql/londiste/functions/londiste.global_add_table.sql b/sql/londiste/functions/londiste.global_add_table.sql
index 40b22d62cab2bbad20659bac6a35d3d3d63ed6d2..e64315cf088ef1fd704b1ac438659ed7e226c477 100644 (file)
--- a/sql/londiste/functions/londiste.global_add_table.sql
+++ b/sql/londiste/functions/londiste.global_add_table.sql
@@ -34,13 +34,14 @@ begin
 
     perform 1 from londiste.table_info where queue_name = i_queue_name and table_name = fq_table_name;
     if found then
-        select 200, 'OK, already added: ' || fq_table_name into ret_code, ret_note;
+        select 200, 'Table already added: ' || fq_table_name into ret_code, ret_note;
         return;
     end if;
 
     insert into londiste.table_info (queue_name, table_name)
         values (i_queue_name, fq_table_name);
-    select 200, 'OK' into ret_code, ret_note;
+    select 200, 'Table added: ' || i_table_name
+        into ret_code, ret_note;
     return;
 end;
 $$ language plpgsql strict;

diff --git a/sql/londiste/functions/londiste.global_remove_table.sql b/sql/londiste/functions/londiste.global_remove_table.sql
index dd473b405e21b0811dc2aea826156045ef2cfa83..cc8065985c53e9e3544e29ede6a81e58a371f835 100644 (file)
--- a/sql/londiste/functions/londiste.global_remove_table.sql
+++ b/sql/londiste/functions/londiste.global_remove_table.sql
@@ -29,10 +29,12 @@ begin
         where queue_name = i_queue_name
           and table_name = fq_table_name;
     if not found then
-        select 400, 'Not found: '||fq_table_name into ret_code, ret_note;
+        select 400, 'Table not found: ' || fq_table_name
+            into ret_code, ret_note;
         return;
     end if;
-    select 200, 'OK' into ret_code, ret_note;
+    select 200, 'Table removed: ' || i_table_name
+        into ret_code, ret_note;
     return;
 end;
 $$ language plpgsql strict;

diff --git a/sql/londiste/functions/londiste.root_check_seqs.sql b/sql/londiste/functions/londiste.root_check_seqs.sql
index 81be6aa38f731fe1304196b85cbd6fd88a72d7f0..6170ff024c6e7eb137e44099400c8c003c505482 100644 (file)
--- a/sql/londiste/functions/londiste.root_check_seqs.sql
+++ b/sql/londiste/functions/londiste.root_check_seqs.sql
@@ -61,7 +61,7 @@ begin
         end if;
     end loop;
 
-    select 200, 'Sequences updated' into ret_code, ret_note;
+    select 100, 'Sequences updated' into ret_code, ret_note;
     return;
 end;
 $$ language plpgsql;

diff --git a/sql/pgq_node/functions/pgq_node.set_consumer_completed.sql b/sql/pgq_node/functions/pgq_node.set_consumer_completed.sql
index b3da773020c82133e678a89d7022491b8a1206d7..6bcbf5358a20d251a42f96aeaaa4bc5fd83dce6b 100644 (file)
--- a/sql/pgq_node/functions/pgq_node.set_consumer_completed.sql
+++ b/sql/pgq_node/functions/pgq_node.set_consumer_completed.sql
@@ -23,7 +23,8 @@ begin
      where queue_name = i_queue_name
        and consumer_name = i_consumer_name;
     if found then
-        select 200, 'Ok' into ret_code, ret_note;
+        select 100, 'Consumer ' || i_consumer_name || ' compleded tick = ' || i_tick_id
+            into ret_code, ret_note;
     else
         select 404, 'Consumer not known: '
                || i_queue_name || '/' || i_consumer_name

diff --git a/sql/pgq_node/functions/pgq_node.set_global_watermark.sql b/sql/pgq_node/functions/pgq_node.set_global_watermark.sql
index 1f27177383863d738de0f77304232935ff1ddebc..b422a86b91be90e341401f65fa5cefb09e75cb2b 100644 (file)
--- a/sql/pgq_node/functions/pgq_node.set_global_watermark.sql
+++ b/sql/pgq_node/functions/pgq_node.set_global_watermark.sql
@@ -66,7 +66,8 @@ begin
                 and consumer_name = this.worker_name;
     end if;
 
-    select 200, 'Ok' into ret_code, ret_note;
+    select 200, 'Global watermark set to ' || _wm
+        into ret_code, ret_note;
     return;
 end;
 $$ language plpgsql security definer;

diff --git a/sql/pgq_node/functions/pgq_node.set_subscriber_watermark.sql b/sql/pgq_node/functions/pgq_node.set_subscriber_watermark.sql
index 6e1aa35d124d37c1e6d37d66304db58eece19734..b492e9ea588535a08bafeb908054fefa3c4c55ff 100644 (file)
--- a/sql/pgq_node/functions/pgq_node.set_subscriber_watermark.sql
+++ b/sql/pgq_node/functions/pgq_node.set_subscriber_watermark.sql
@@ -33,10 +33,20 @@ begin
     end if;
 
     -- todo: check if wm sane?
+    if i_watermark < n.last_tick then
+        select 405, 'watermark must not be moved backwards'
+            into ret_code, ret_note;
+        return;
+    elsif i_watermark = n.last_tick then
+        select 100, 'watermark already set'
+            into ret_code, ret_note;
+        return;
+    end if;
 
     perform pgq.register_consumer_at(i_queue_name, wm_name, i_watermark);
 
-    select 200, 'Ok' into ret_code, ret_note;
+    select 200, wm_name || ' set to ' || i_watermark
+        into ret_code, ret_note;
     return;
 end;
 $$ language plpgsql security definer;