pgpool2.git / summary / log / commit / refs

commit    96dff4d55aeee00cdc6fc7e82ddda345cbb360cc
Author:   Muhammad Usama <m.usama@gmail.com>
Date:     Tue Nov 24 14:56:34 2015 +0000

    Removing some mistakenly left-out debug prints from the code


 src/utils/json_writer.c     |  5 -----
 src/watchdog/wd_heartbeat.c | 20 ++++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/utils/json_writer.c b/src/utils/json_writer.c
index 114929230..fb8f4ebcc 100644
--- a/src/utils/json_writer.c
+++ b/src/utils/json_writer.c
@@ -184,12 +184,10 @@ bool jw_start_element(JsonNode* jNode, JWElementType element, char* key)
 
 	if (element == JWOBJECT)
 	{
-//		printf("starting JSCON OBJECT on stack ptr = %d\n",jNode->stack_ptr);
 		ch = '{';
 	}
 	else if (element == JWARRAY)
 	{
-//		printf("starting JSCON ARRAY on stack ptr = %d\n",jNode->stack_ptr);
 		ch = '[';
 	}
 	else
@@ -276,7 +274,6 @@ static inline void jw_inc_current_element_count(JsonNode* jNode)
 {
 	if (jNode->stack_ptr <= 0)
 		return;
-//	printf("starting JSCON CURRENT = %d on stack ptr = %d\n",jNode->stack[jNode->stack_ptr -1].elementType,jNode->stack_ptr);
 	jNode->stack[jNode->stack_ptr -1].elementCount++;
 }
 
@@ -284,7 +281,5 @@ static inline JWElementType jw_get_current_element_type(JsonNode* jNode)
 {
 	if (jNode->stack_ptr <= 0)
 		return -1;
-//	printf("starting JSCON CURRENT = %d on stack ptr = %d\n",jNode->stack[jNode->stack_ptr -1].elementType,jNode->stack_ptr);
-
 	return jNode->stack[jNode->stack_ptr -1].elementType;
 }
\ No newline at end of file
diff --git a/src/watchdog/wd_heartbeat.c b/src/watchdog/wd_heartbeat.c
index 8f0144eab..5dd9e3de8 100644
--- a/src/watchdog/wd_heartbeat.c
+++ b/src/watchdog/wd_heartbeat.c
@@ -429,12 +429,9 @@ wd_hb_receiver(int fork_wait_time, WdHbIf *hb_if)
 		{
 			LifeCheckNode* node = &gslifeCheckCluster->lifeCheckNodes[i];
 
-//			printf("*******watchdog heartbeat: received heartbeat signal from \"%s:%d\"\n",
-//							from, from_pgpool_port);
-
-//			ereport(DEBUG1,
-//					(errmsg("*******watchdog heartbeat: received heartbeat signal from \"%s:%d\"",
-//							from, from_pgpool_port)));
+			ereport(DEBUG2,
+					(errmsg("received heartbeat signal from \"%s:%d\"",
+							from, from_pgpool_port)));
 
 			if (!strcmp(node->hostName, from) && node->pgpoolPort == from_pgpool_port)
 			{
@@ -442,10 +439,8 @@ wd_hb_receiver(int fork_wait_time, WdHbIf *hb_if)
 				if (!WD_TIME_ISSET(node->hb_send_time) ||
 					WD_TIME_BEFORE(node->hb_send_time, pkt.send_time))
 				{
-//					printf("\t %d*******watchdog heartbeat: received heartbeat signal from \"%s:%d\"\n",
-//						   i,from, from_pgpool_port);
-					ereport(NOTICE,
-							(errmsg("watchdog heartbeat: received heartbeat signal from \"%s:%d\"",
+					ereport(LOG,
+							(errmsg("received heartbeat signal from \"%s:%d\"",
 									from, from_pgpool_port)));
 					
 					node->hb_send_time = pkt.send_time;
@@ -453,11 +448,8 @@ wd_hb_receiver(int fork_wait_time, WdHbIf *hb_if)
 				}
 				else
 				{
-//					printf("\t %dOLDER OLDER *******watchdog heartbeat: received heartbeat signal from \"%s:%d\"\n",
-//						   i,from, from_pgpool_port);
-
 					ereport(NOTICE,
-							(errmsg("watchdog heartbeat: received heartbeat signal is older than the latest, ignored")));
+							(errmsg("received heartbeat signal is older than the latest, ignored")));
 				}
 				break;
 			}


[parent: 89f9b322d74e]