v0.4.1 Clarify commit warning messages. See CHANGELOG for more info a…

…nd the extension update file for how to install
redrick · Mar 15, 2016 · 1290d7c · 1290d7c
1 parent 2bfcc18
commit 1290d7c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.4.1
+-- Clarify commit warning messages with error codes. Also corrected the warning message for rollbacks (Github Pull Request #15).
+
+
 0.4.0
 -- Add support for commonly used amqp message properties (delivery_mode, content_type, reply_to and correlation_id) for publish() and autonomous_publish(). Many thanks to netalien for the contribution. (Github PR #13).
 -- This software is now only supported as a PostgreSQL Extension. PG versions prior to 9.1 and means to install it without the extension system are no longer officially supported. PostgreSQL 9.0 is EOL as of Sept 2015 (http://www.postgresql.org/support/versioning/)

diff --git a/META.json b/META.json
@@ -1,7 +1,7 @@
 {
    "name": "pg_amqp",
    "abstract": "AMQP protocol support for PostgreSQL",
-   "version": "0.4.0",
+   "version": "0.4.1",
    "description": "The pg_amqp package provides the ability for postgres statements to directly publish messages to an AMQP broker.",
    "maintainer": 
        [ "Theo Schlossnagle <[email protected]>", "Keith Fiske <[email protected]" ] 
@@ -17,9 +17,9 @@
     },
    "provides": {
      "amqp": {
-       "file": "sql/amqp--0.4.0.sql",
+       "file": "sql/amqp--0.4.1.sql",
         "docfile": "doc/amqp.md",
-       "version": "0.4.0",
+       "version": "0.4.1",
        "abstract": "AMQP protocol support for PostgreSQL"
      }
    },

diff --git a/amqp.control b/amqp.control
@@ -1,6 +1,6 @@
 # amqp extension
 comment = 'AMQP protocol support for PostgreSQL'
-default_version = '0.4.0'
+default_version = '0.4.1'
 module_pathname = '$libdir/pg_amqp'
 relocatable = false
 schema = amqp
diff --git a/src/pg_amqp.c b/src/pg_amqp.c
@@ -105,7 +105,7 @@ static void amqp_local_phase2(XactEvent event, void *arg) {
         if(bs->conn) amqp_tx_commit(bs->conn, 2, AMQP_EMPTY_TABLE);
         reply = amqp_get_rpc_reply();
         if(reply->reply_type != AMQP_RESPONSE_NORMAL) {
-          elog(WARNING, "amqp could not commit tx mode on broker %d", bs->broker_id);
+          elog(WARNING, "amqp could not commit tx mode on broker %d, reply_type=%d, library_errno=%d", bs->broker_id, reply->reply_type, reply->library_errno);
           local_amqp_disconnect_bs(bs);
         }
         bs->uncommitted = 0;
@@ -119,7 +119,7 @@ static void amqp_local_phase2(XactEvent event, void *arg) {
         if(bs->conn) amqp_tx_rollback(bs->conn, 2, AMQP_EMPTY_TABLE);
         reply = amqp_get_rpc_reply();
         if(reply->reply_type != AMQP_RESPONSE_NORMAL) {
-          elog(WARNING, "amqp could not commit tx mode on broker %d", bs->broker_id);
+          elog(WARNING, "amqp could not rollback tx mode on broker %d, reply_type=%d, library_errno=%d", bs->broker_id, reply->reply_type, reply->library_errno);
           local_amqp_disconnect_bs(bs);
         }
         bs->uncommitted = 0;

diff --git a/updates/amqp--0.4.0--0.4.1.sql b/updates/amqp--0.4.0--0.4.1.sql
@@ -0,0 +1,3 @@
+-- NOTE: No changes to sql extension code contained in this update. Only C code has been patched, so a "make install" must be run to apply the bug fix. You must also still run "ALTER EXTENSION pg_ampq UPDATE' to update the extension version number in the database. 
+
+-- Clarify commit/rollback warning messages (Github Pull Request #15)