pgpool2.git / summary / log / commit / refs

commit    23bbc2c50317618e937bc256035ecb2e6c2d7cc3
Author:   at.mitani <at.mitani@gmail.com>
Date:     Mon Jun 11 08:12:38 2012 +0000

    changed config context to 'other_wd_port' from 'other_pgpool_wd_port'.


 pool_config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pool_config.c b/pool_config.c
index 0963e243f..57f3feb46 100644
--- a/pool_config.c
+++ b/pool_config.c
@@ -1861,7 +1861,7 @@ int pool_init_config(void)
 	pool_config->other_wd = malloc(sizeof(WdDesc));
 	if (pool_config->other_wd == NULL)
 	{
-		pool_error("failed to allocate pool_config->cwother_wd");
+		pool_error("failed to allocate pool_config->other_wd");
 		return -1;
 	}
 	memset(pool_config->other_wd,0,sizeof(WdDesc));
@@ -3643,16 +3643,16 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
 				WD_INFO(slot).pgpool_port = atoi(yytext);
 		}
 
-		else if (!strncmp(key, "other_pgpool_wd_port", 20) &&
+		else if (!strncmp(key, "other_wd_port", 13) &&
 				 CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
 				 mypid == getpid()) /* this parameter must be modified by parent pid */
 		{
 			int slot;
 
-			slot = atoi(key + 20);
+			slot = atoi(key + 13);
 			if (slot < 0 || slot >= MAX_CONNECTION_SLOTS)
 			{
-				pool_error("pool_config: pgpool number %s for other_pgpool_wd_port out of range", key);
+				pool_error("pool_config: pgpool number %s for other_wd_port out of range", key);
 				fclose(fd);
 				return(-1);
 			}


[parent: ce5731d0d263]