You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/11/28 22:00:41 UTC
[39/47] couchdb commit: updated refs/heads/enable-csp-default to
dbd38a1
Normalize args
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d81b989b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d81b989b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d81b989b
Branch: refs/heads/enable-csp-default
Commit: d81b989b2084d5ab870fdaca2c43e140ff70517e
Parents: f2a5c33
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Nov 15 18:43:33 2014 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Nov 15 18:50:55 2014 +0300
----------------------------------------------------------------------
dev/run | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d81b989b/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 35be796..bb1286d 100755
--- a/dev/run
+++ b/dev/run
@@ -214,7 +214,7 @@ def hashify(pwd, salt=COMMON_SALT, iterations=10, keylen=20):
def startup(ctx):
atexit.register(kill_processes, ctx)
boot_nodes(ctx)
- join_nodes("127.0.0.1", 15986, ctx)
+ join_nodes(ctx, "127.0.0.1", 15986)
def kill_processes(ctx):
@@ -225,7 +225,7 @@ def kill_processes(ctx):
def boot_nodes(ctx):
for node in ctx['nodes']:
- ctx['procs'].append(boot_node(node, ctx))
+ ctx['procs'].append(boot_node(ctx, node))
ensure_nodes_stated(ctx)
@@ -254,7 +254,7 @@ def all_nodes_alive(ctx):
@log('Start node {node}')
-def boot_node(node, ctx):
+def boot_node(ctx, node):
erl_libs = os.path.join(ctx['rootdir'], "src")
env = os.environ.copy()
env["ERL_LIBS"] = os.pathsep.join([erl_libs])
@@ -280,7 +280,7 @@ def boot_node(node, ctx):
@log('Join nodes into cluster')
-def join_nodes(host, port, ctx):
+def join_nodes(ctx, host, port):
for node in ctx['nodes']:
body = "{}"
conn = httpclient.HTTPConnection(host, port)