From: Bo Peng <pengbo@sraoss.co.jp>
Date: Fri, 31 Jan 2025 00:43:57 +0000 (+0900)
Subject: Fix per_node_error_log() error message that is printed with two colons.
X-Git-Tag: V4_2_21~6
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=b7eca1707c9899b234c67314d5b7040b50fdf850;p=pgpool2.git

Fix per_node_error_log() error message that is printed with two colons.

Patch is created by Umar Hayat.
---

diff --git a/src/context/pool_query_context.c b/src/context/pool_query_context.c
index b041f9385..327c7a38b 100644
--- a/src/context/pool_query_context.c
+++ b/src/context/pool_query_context.c
@@ -970,7 +970,7 @@ pool_send_and_wait(POOL_QUERY_CONTEXT * query_context,
 		 * that any session object (i.e. named statement) does not remain in
 		 * the last session.
 		 */
-		if (per_node_error_log(backend, i, string, "pool_send_and_wait: Error or notice message from backend: ", true) == 'E')
+		if (per_node_error_log(backend, i, string, "pool_send_and_wait: Error or notice message from backend", true) == 'E')
 			reset_query_error = true;
 	}
 
@@ -1182,7 +1182,7 @@ pool_extended_send_and_wait(POOL_QUERY_CONTEXT * query_context,
 			 * does not report what statement caused that error and make users
 			 * confused.
 			 */
-			per_node_error_log(backend, i, str, "pool_send_and_wait: Error or notice message from backend: ", true);
+			per_node_error_log(backend, i, str, "pool_send_and_wait: Error or notice message from backend", true);
 		}
 	}
 
diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c
index 0e18e8a68..aa51650b1 100644
--- a/src/protocol/pool_proto_modules.c
+++ b/src/protocol/pool_proto_modules.c
@@ -1563,7 +1563,7 @@ Parse(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend,
 		 * PostgreSQL does not report what statement caused that error and
 		 * make users confused.
 		 */
-		per_node_error_log(backend, MAIN_NODE_ID, stmt, "Parse: Error or notice message from backend: ", true);
+		per_node_error_log(backend, MAIN_NODE_ID, stmt, "Parse: Error or notice message from backend", true);
 
 		if (deadlock_detected)
 		{
@@ -2288,7 +2288,7 @@ ReadyForQuery(POOL_CONNECTION * frontend,
 			if (!pool_read_buffer_is_empty(CONNECTION(backend, i)))
 				per_node_error_log(backend, i,
 								   "(out of band message)",
-								   "ReadyForQuery: Error or notice message from backend: ", false);
+								   "ReadyForQuery: Error or notice message from backend", false);
 		}
 	}