pgpool2.git / summary / log / commit / refs

commit    84f28a912d9bf0855cc9631a55ce779f6feeebab
Author:   Yoshiyuki Asaba <y-asaba at pgfoundry.org>
Date:     Fri Oct 12 05:55:03 2007 +0000

    Fix compiler warning.


 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 4fc51edbe..856ffcc80 100644
--- a/main.c
+++ b/main.c
@@ -1106,11 +1106,11 @@ static void failover(void)
 	 */
 	pool_debug("failover_handler: starting to selec new master node");
 	switching = 1;
+	node_id = Req_info->node_id[0];
 
 	/* failback request? */
 	if (Req_info->kind == NODE_UP_REQUEST)
 	{
-		node_id = Req_info->node_id[0];
 		if (node_id >= MAX_NUM_BACKENDS ||
 			(Req_info->kind == NODE_UP_REQUEST && VALID_BACKEND(node_id)) ||
 			(Req_info->kind == NODE_DOWN_REQUEST && !VALID_BACKEND(node_id)))
@@ -1143,7 +1143,7 @@ static void failover(void)
 
 
 				BACKEND_INFO(Req_info->node_id[i]).backend_status = CON_DOWN;	/* set down status */
-				trigger_failover_command(node_id, pool_config->failover_command);
+				trigger_failover_command(Req_info->node_id[i], pool_config->failover_command);
 				cnt++;
 			}
 		}


[parent: 816f3a529667]