Fix redundant messages in log_client_messages.

Patch contributed by Takuma Hoshiai.

diff --git a/src/protocol/child.c b/src/protocol/child.c
index 9914c1e8321b18925558ede6f9e645b475507717..4a970c525077800f7922613b9ceceb2cf2c1bba3 100644 (file)
--- a/src/protocol/child.c
+++ b/src/protocol/child.c
@@ -748,7 +748,7 @@ void cancel_request(CancelPacket *sp)
 
        if (pool_config->log_client_messages)
                ereport(LOG,
-                       (errmsg("CancelRequest: Cancel message from frontend."),
+                       (errmsg("Cancel message from frontend."),
                                errdetail("process id: %d", ntohl(sp->pid) )));
     ereport(DEBUG1,
             (errmsg("Cancel request received")));

diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c
index 56ee7b93db6f85cd32150329c5350b0a4098f8cf..27b164b8d32953fe2bcf0fe28a7046e314bf6756 100644 (file)
--- a/src/protocol/pool_proto_modules.c
+++ b/src/protocol/pool_proto_modules.c
@@ -691,7 +691,7 @@ POOL_STATUS Execute(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
 
        if (pool_config->log_client_messages)
                ereport(LOG,
-                       (errmsg("Execute: Execute message from frontend."),
+                       (errmsg("Execute message from frontend."),
                                errdetail("portal: \"%s\"",contents)));
        ereport(DEBUG2,
             (errmsg("Execute: portal name <%s>", contents)));
@@ -969,7 +969,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
 
        if (pool_config->log_client_messages)
                ereport(LOG,
-                       (errmsg("Parse: Parse message from frontend."),
+                       (errmsg("Parse message from frontend."),
                                errdetail("statement: \"%s\", query: \"%s\"",name, stmt)));
 
        /* parse SQL string */
@@ -1312,7 +1312,7 @@ POOL_STATUS Bind(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
 
        if (pool_config->log_client_messages)
                ereport(LOG,
-                       (errmsg("Bind: Bind message from frontend."),
+                       (errmsg("Bind message from frontend."),
                                errdetail("portal: \"%s\", statement: \"%s\"",portal_name, pstmt_name)));
        parse_msg = pool_get_sent_message('Q', pstmt_name, POOL_SENT_MESSAGE_CREATED);
        if (!parse_msg)
@@ -1458,7 +1458,7 @@ POOL_STATUS Describe(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        {
                if (pool_config->log_client_messages)
                        ereport(LOG,
-                               (errmsg("Describe: Describe message from frontend."),
+                               (errmsg("Describe message from frontend."),
                                        errdetail("statement: \"%s\"",contents+1 )));
                msg = pool_get_sent_message('Q', contents+1, POOL_SENT_MESSAGE_CREATED);
                if (!msg)
@@ -1474,7 +1474,7 @@ POOL_STATUS Describe(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        {
                if (pool_config->log_client_messages)
                        ereport(LOG,
-                               (errmsg("Describe: Describe message from frontend."),
+                               (errmsg("Describe message from frontend."),
                                        errdetail("portal: \"%s\"",contents+1 )));
                msg = pool_get_sent_message('B', contents+1, POOL_SENT_MESSAGE_CREATED);
                if (!msg)
@@ -1543,7 +1543,7 @@ POOL_STATUS Close(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                msg = pool_get_sent_message('Q', contents+1, POOL_SENT_MESSAGE_CREATED);
                if (pool_config->log_client_messages)
                        ereport(LOG,
-                               (errmsg("Close: Close message from frontend."),
+                               (errmsg("Close message from frontend."),
                                        errdetail("statement: \"%s\"",contents+1)));
                if (!msg)
                        msg = pool_get_sent_message('P', contents+1, POOL_SENT_MESSAGE_CREATED);
@@ -1553,7 +1553,7 @@ POOL_STATUS Close(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        {
                if (pool_config->log_client_messages)
                        ereport(LOG,
-                               (errmsg("Close: Close message from frontend."),
+                               (errmsg("Close message from frontend."),
                                        errdetail("portal: \"%s\"",contents+1)));
                msg = pool_get_sent_message('B', contents+1, POOL_SENT_MESSAGE_CREATED);
        }
@@ -2393,7 +2393,7 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                                pfree(contents);
                        if (pool_config->log_client_messages)
                                ereport(LOG,
-                                       (errmsg("Terminate: Terminate message from frontend.")));
+                                       (errmsg("Terminate message from frontend.")));
             ereport(DEBUG5,
                 (errmsg("Frontend terminated"),
                      errdetail("received message kind 'X' from frontend")));
@@ -2403,7 +2403,7 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                        allow_close_transaction = 1;
                        if (pool_config->log_client_messages)
                                ereport(LOG,
-                                       (errmsg("Query: Query message from frontend."),
+                                       (errmsg("Query message from frontend."),
                                                errdetail("query: \"%s\"",contents)));
                        status = SimpleQuery(frontend, backend, len, contents);
                        break;
@@ -2442,7 +2442,7 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                case 'S':  /* Sync */
                        if (pool_config->log_client_messages)
                                ereport(LOG,
-                                       (errmsg("Sync: Sync message from frontendend.")));
+                                       (errmsg("Sync message from frontend.")));
                        pool_set_doing_extended_query_message();
                        if (pool_is_ignore_till_sync())
                                pool_unset_ignore_till_sync();
@@ -2473,7 +2473,7 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                                int oid;
                                memcpy(&oid, contents, sizeof(int));
                                ereport(LOG,
-                                       (errmsg("FunctionCall: FunctionCall message from frontend."),
+                                       (errmsg("FunctionCall message from frontend."),
                                                errdetail("oid: \"%d\"", ntohl(oid) )));
                        }
                        /*
@@ -2505,7 +2505,7 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                case 'H':       /* Flush */
                        if (fkind == 'H' && pool_config->log_client_messages)
                                ereport(LOG,
-                                       (errmsg("Flush: Flush message from frontend.")));
+                                       (errmsg("Flush message from frontend.")));
                        if (MAJOR(backend) == PROTO_MAJOR_V3)
                        {
                                if (fkind == 'H')
@@ -2904,14 +2904,14 @@ POOL_STATUS CopyDataRows(POOL_CONNECTION *frontend,
                                {
                                        if (pool_config->log_client_messages && copy_count !=0 )
                                                ereport(LOG,
-                                                       (errmsg("CopyData: CopyData message from frontend."),
+                                                       (errmsg("CopyData message from frontend."),
                                                                errdetail("count: %d", copy_count)));
                                        if (kind == 'c' && pool_config->log_client_messages)
                                                ereport(LOG,
-                                                       (errmsg("CopyDone: CopyDone message from frontend.")));
+                                                       (errmsg("CopyDone message from frontend.")));
                                        if (kind == 'f' && pool_config->log_client_messages)
                                                ereport(LOG,
-                                                       (errmsg("CopyFail: CopyFail message from frontend.")));
+                                                       (errmsg("CopyFail message from frontend.")));
                                        ereport(DEBUG1,
                                                (errmsg("copy data rows"),
                                                        errdetail("invalid copyin kind. expected 'd' got '%c'", kind)));

diff --git a/src/test/regression/tests/019.log_client_messages/test.sh b/src/test/regression/tests/019.log_client_messages/test.sh
index 4e649d3c52f89b6000f57725ce380acd0b3f98f1..ea186c9beef28bc8bb6d813287a889a703da0a48 100755 (executable)
--- a/src/test/regression/tests/019.log_client_messages/test.sh
+++ b/src/test/regression/tests/019.log_client_messages/test.sh
@@ -75,55 +75,55 @@ sleep 2
 
 ./shutdownall
 #Bind
-grep -A 1 -e "Bind: Bind message from frontend." log/pgpool.log |grep -E "portal: \".*\", statement: \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Bind message from frontend." log/pgpool.log |grep -E "portal: \".*\", statement: \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Bind log"
        success_count=$(( success_count + 1 ))
 fi
 #CancelRequest
-grep -A 1 -e "CancelRequest: Cancel message from frontend" log/pgpool.log |grep -E "process id: .+" >/dev/null 2>&1
+grep -A 1 -e "Cancel message from frontend." log/pgpool.log |grep -E "process id: .+" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: CancelRequest log"
        success_count=$(( success_count + 1 ))
 fi
 #Close
-grep -A 1 -e "Close: Close message from frontend" log/pgpool.log |grep -E "(portal|statement): \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Close message from frontend." log/pgpool.log |grep -E "(portal|statement): \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Close log"
        success_count=$(( success_count + 1 ))
 fi
 #CopyData
-grep -A 1 -e "CopyData message from frontend" log/pgpool.log |grep -E "count: [0-9]+"  >/dev/null 2>&1
+grep -A 1 -e "CopyData message from frontend." log/pgpool.log |grep -E "count: [0-9]+"  >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: CopyData log"
        success_count=$(( success_count + 1 ))
 fi
 #CopyDone
-grep -e "CopyDone message from frontend" log/pgpool.log >/dev/null 2>&1
+grep -e "CopyDone message from frontend." log/pgpool.log >/dev/null 2>&1
 if [ $? = 0 ];then
     echo "success: CopyDone log"
     success_count=$(( success_count + 1 ))
 fi
 #CopyFail
-grep -e "CopyFail message from frontend" log/pgpool.log >/dev/null 2>&1
+grep -e "CopyFail message from frontend." log/pgpool.log >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: CopyFail log"
        success_count=$(( success_count + 1 ))
 fi
 #Describe
-grep -A 1 -e "Describe: Describe message from frontend." log/pgpool.log |grep -E "(portal|statement): \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Describe message from frontend." log/pgpool.log |grep -E "(portal|statement): \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Describe log"
        success_count=$(( success_count + 1 ))
 fi
 #Execute
-grep -A 1 -e "Execute: Execute message from frontend." log/pgpool.log |grep -E "portal: \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Execute message from frontend." log/pgpool.log |grep -E "portal: \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Execute log"
        success_count=$(( success_count + 1 ))
 fi
 #Flush
-grep -e "Flush: Flush message from frontend" log/pgpool.log >/dev/null 2>&1
+grep -e "Flush message from frontend." log/pgpool.log >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Flush log"
        success_count=$(( success_count + 1 ))
@@ -135,25 +135,25 @@ if [ $? = 0 ];then
        success_count=$(( success_count + 1 ))
 fi
 #Parse
-grep -A 1 -e "Parse: Parse message from frontend." log/pgpool.log |grep -E "statement: \".*\", query: \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Parse message from frontend." log/pgpool.log |grep -E "statement: \".*\", query: \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Parse log"
        success_count=$(( success_count + 1 ))
 fi
 #Query
-grep -A 1 -e "Query: Query message from frontend." log/pgpool.log |grep -E "query: \".*\"" >/dev/null 2>&1
+grep -A 1 -e "Query message from frontend." log/pgpool.log |grep -E "query: \".*\"" >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Query log"
        success_count=$(( success_count + 1 ))
 fi
 #Sync
-grep -e "Sync: Sync message from frontend." log/pgpool.log >/dev/null 2>&1
+grep -e "Sync message from frontend." log/pgpool.log >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Sync log"
        success_count=$(( success_count + 1 ))
 fi
 #Terminate
-grep -e "Terminate: Terminate message from frontend." log/pgpool.log >/dev/null 2>&1
+grep -e "Terminate message from frontend." log/pgpool.log >/dev/null 2>&1
 if [ $? = 0 ];then
        echo "success: Terminate log"
        success_count=$(( success_count + 1 ))