From a707e3fb178c7446651ca2195e312b5ac4699ab1 Mon Sep 17 00:00:00 2001
From: David-Sarah Hopwood <david-sarah@jacaranda.org>
Date: Thu, 3 Jan 2013 18:52:37 +0000
Subject: [PATCH] startstop_node.py: rename internal command and twistd plugin
 class used to start tahoe nodes.

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
---
 src/allmydata/scripts/startstop_node.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/allmydata/scripts/startstop_node.py b/src/allmydata/scripts/startstop_node.py
index 6669e9d7..90ec1046 100644
--- a/src/allmydata/scripts/startstop_node.py
+++ b/src/allmydata/scripts/startstop_node.py
@@ -38,10 +38,10 @@ class RunOptions(StartOptions):
 
 
 class MyTwistdConfig(twistd.ServerOptions):
-    subCommands = [("XYZ", None, usage.Options, "node")]
+    subCommands = [("StartTahoeNode", None, usage.Options, "node")]
 
-class NodeStartingPlugin:
-    tapname = "xyznode"
+class StartTahoeNodePlugin:
+    tapname = "tahoenode"
     def __init__(self, nodetype, basedir):
         self.nodetype = nodetype
         self.basedir = basedir
@@ -104,7 +104,7 @@ def start(config, out=sys.stdout, err=sys.stderr):
         fileutil.make_dirs(os.path.join(basedir, "logs"))
         twistd_args.extend(["--logfile", os.path.join("logs", "twistd.log")])
     twistd_args.extend(config.twistd_args)
-    twistd_args.append("XYZ") # point at our NodeStartingPlugin
+    twistd_args.append("StartTahoeNode") # point at our StartTahoeNodePlugin
 
     twistd_config = MyTwistdConfig()
     try:
@@ -114,7 +114,7 @@ def start(config, out=sys.stdout, err=sys.stderr):
         print >>err, twistd_config
         print >>err, "tahoe start: %s" % (config.subCommand, ue)
         return 1
-    twistd_config.loadedPlugins = {"XYZ": NodeStartingPlugin(nodetype, basedir)}
+    twistd_config.loadedPlugins = {"StartTahoeNode": StartTahoeNodePlugin(nodetype, basedir)}
 
     # Unless --nodaemon was provided, the twistd.runApp() below spawns off a
     # child process, and the parent calls os._exit(0), so there's no way for
-- 
2.45.2