diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2014-02-06 16:08:05 -0600 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2014-02-06 16:08:05 -0600 |
| commit | 089f3adc62d1a68eb10e6dfd26c707fe264bae71 (patch) | |
| tree | f02a2e664f648272a6d1649cb3f706ef14b216d5 /dev | |
| parent | 49cb55177b0177c61f7eacff0e65b2be3b9082c1 (diff) | |
| download | couchdb-089f3adc62d1a68eb10e6dfd26c707fe264bae71.tar.gz | |
Remove reliance on the curl command in dev/run
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/run | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -15,6 +15,7 @@ import atexit import contextlib as ctx import glob +import httplib import optparse as op import os import re @@ -163,11 +164,16 @@ def boot_node(node): env=env) -def connect_nodes(backdoor): - for i in range(1,4): - cmd = "curl -s %snodes/node%s@127.0.0.1 -X PUT -d '{}'" - cmd = cmd % (backdoor, i) - sp.check_call(cmd, shell=True) +def connect_nodes(host, port): + global N + for i in range(1, N+1): + body = "{}" + conn = httplib.HTTPConnection(host, port) + conn.request("PUT", "/nodes/node%d@127.0.0.1" % i, body) + resp = conn.getresponse() + if resp.status not in (200, 201, 202, 409): + print resp.reason + exit(1) def kill_processes(): @@ -227,7 +233,7 @@ def main(): atexit.register(kill_processes) boot_nodes() - connect_nodes("http://127.0.0.1:15986/") + connect_nodes("127.0.0.1", 15986) if len(args): run_command(" ".join(args)) |
