You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2013/12/23 23:43:28 UTC

git commit: updated refs/heads/1843-feature-bigcouch to c4421da

Updated Branches:
  refs/heads/1843-feature-bigcouch 69b9fd3a4 -> c4421dac4


Make HAProxy command dynamic


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c4421dac
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c4421dac
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c4421dac

Branch: refs/heads/1843-feature-bigcouch
Commit: c4421dac4e0a32752de6284858cc92461ee09c56
Parents: 69b9fd3
Author: Russell Branca <ch...@gmail.com>
Authored: Mon Dec 23 14:43:27 2013 -0800
Committer: Russell Branca <ch...@gmail.com>
Committed: Mon Dec 23 14:43:27 2013 -0800

----------------------------------------------------------------------
 rel/boot_dev_cluster.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c4421dac/rel/boot_dev_cluster.sh
----------------------------------------------------------------------
diff --git a/rel/boot_dev_cluster.sh b/rel/boot_dev_cluster.sh
index 4559141..a517fd4 100755
--- a/rel/boot_dev_cluster.sh
+++ b/rel/boot_dev_cluster.sh
@@ -3,6 +3,8 @@
 # Make log directory
 mkdir -p ./rel/logs/
 
+HAPROXY=`which haproxy`
+
 # Start each node
 ./rel/dev1/bin/couchdb > ./rel/logs/couchdb1.log 2>&1 &
 DB1_PID=$!
@@ -13,7 +15,7 @@ DB2_PID=$!
 ./rel/dev3/bin/couchdb > ./rel/logs/couchdb3.log 2>&1 &
 DB3_PID=$!
 
-/usr/local/sbin/haproxy -f rel/haproxy.cfg > ./rel/logs/haproxy.log 2>&1 &
+$HAPROXY -f rel/haproxy.cfg > ./rel/logs/haproxy.log 2>&1 &
 HP_PID=$!
 
 sleep 2