tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

startstop_node.py: don't pass config to do_start() and do_stop()

This commit is contained in:
Zooko O'Whielacronx 2007-09-21 15:03:15 -07:00
parent 28b2c19f1e
commit 20079e3019
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/scripts/startstop_node.py
View File

@ -25,7 +25,7 @@ class RestartOptions(BasedirMixin, usage.Options):
"of 'restart'"],
]
def do_start(basedir, config, out=sys.stdout, err=sys.stderr):
def do_start(basedir, out=sys.stdout, err=sys.stderr):
print >>out, "STARTING", basedir
if os.path.exists(os.path.join(basedir, "client.tac")):
tac = "client.tac"
@ -66,7 +66,7 @@ def do_start(basedir, config, out=sys.stdout, err=sys.stderr):
print >>err, "%s node probably not started" % type
return 1
def do_stop(basedir, config, out=sys.stdout, err=sys.stderr):
def do_stop(basedir, out=sys.stdout, err=sys.stderr):
print >>out, "STOPPING", basedir
pidfile = os.path.join(basedir, "twistd.pid")
if not os.path.exists(pidfile):
@ -100,19 +100,19 @@ def do_stop(basedir, config, out=sys.stdout, err=sys.stderr):
def start(config, stdout, stderr):
rc = 0
for basedir in config['basedirs']:
rc = do_start(basedir, config, stdout, stderr) or rc
rc = do_start(basedir, stdout, stderr) or rc
return rc
def stop(config, stdout, stderr):
rc = 0
for basedir in config['basedirs']:
rc = do_stop(basedir, config, stdout, stderr) or rc
rc = do_stop(basedir, stdout, stderr) or rc
return rc
def restart(config, stdout, stderr):
rc = 0
for basedir in config['basedirs']:
rc = do_stop(basedir, config, stdout, stderr) or rc
rc = do_stop(basedir, stdout, stderr) or rc
if rc == 2 and config['force']:
print >>stderr, "ignoring couldn't-stop"
rc = 0
@ -120,7 +120,7 @@ def restart(config, stdout, stderr):
print >>stderr, "not restarting"
return rc
for basedir in config['basedirs']:
rc = do_start(basedir, config, stdout, stderr) or rc
rc = do_start(basedir, stdout, stderr) or rc
return rc