pgpool2.git / summary / log / commit / refs

commit    9a17ee696fd2b6753b3f36345b367f861d636fcb
Author:   Yugo Nagata <nagata@sraoss.co.jp>
Date:     Mon Oct 01 05:05:18 2012 +0000

    Revert "Fix to set unix domain socket path for pgpool PCP communication before"
    
    This reverts commit 0667f3651c25cbb437bf98b64072c4f369eed76b.
    
    for mistake of commit log.


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

diff --git a/main.c b/main.c
index 86a5a0130..acde42cce 100644
--- a/main.c
+++ b/main.c
@@ -490,14 +490,10 @@ int main(int argc, char **argv)
 		pool_clear_cache_by_time(interval, 1);
 	}
 
-	/* set unix domain socket path for connections to pgpool */
+	/* set unix domain socket path */
 	snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s/.s.PGSQL.%d",
 			 pool_config->socket_dir,
 			 pool_config->port);
-	/* set unix domain socket path for pgpool PCP communication */
-	snprintf(pcp_un_addr.sun_path, sizeof(pcp_un_addr.sun_path), "%s/.s.PGSQL.%d",
-			 pool_config->pcp_socket_dir,
-			 pool_config->pcp_port);
 
 	/* set up signal handlers */
 	pool_signal(SIGPIPE, SIG_IGN);
@@ -682,6 +678,9 @@ int main(int argc, char **argv)
 	pool_log("%s successfully started. version %s (%s)", PACKAGE, VERSION, PGPOOLVERSION);
 
 	/* fork a child for PCP handling */
+	snprintf(pcp_un_addr.sun_path, sizeof(pcp_un_addr.sun_path), "%s/.s.PGSQL.%d",
+			 pool_config->pcp_socket_dir,
+			 pool_config->pcp_port);
 	pcp_unix_fd = create_unix_domain_socket(pcp_un_addr);
     /* maybe change "*" to pool_config->pcp_listen_addresses */
 	pcp_inet_fd = create_inet_domain_socket("*", pool_config->pcp_port);


[parent: 0ab74d6f5c94]