startstop_node.py: rename internal command and twistd plugin class used to start...

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/scripts/startstop_node.py b/src/allmydata/scripts/startstop_node.py
index 3f8eb7af14f72a9e34218de62cfa5f2972b7de33..e5cb49424ff02455ea05e754ea4569cf7ab1fa2f 100644 (file)
--- a/src/allmydata/scripts/startstop_node.py
+++ b/src/allmydata/scripts/startstop_node.py
@@ -35,10 +35,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
@@ -96,7 +96,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:
@@ -106,7 +106,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)}
 
     # On Unix-like platforms:
     #   Unless --nodaemon was provided, the twistd.runApp() below spawns off a