diff options
Diffstat (limited to 'func')
| -rw-r--r-- | func/minion/AuthedXMLRPCServer.py | 4 | ||||
| -rwxr-xr-x | func/overlord/client.py | 4 | ||||
| -rw-r--r-- | func/overlord/cmd_modules/show.py | 3 | ||||
| -rw-r--r-- | func/overlord/command.py | 5 | ||||
| -rw-r--r-- | func/overlord/func_command.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py index 7bba160..8545d15 100644 --- a/func/minion/AuthedXMLRPCServer.py +++ b/func/minion/AuthedXMLRPCServer.py @@ -60,7 +60,6 @@ class BaseAuthedXMLRPCServer(SocketServer.ForkingMixIn): self.instance = None def get_authinfo(self, request, client_address): - print 'down here' if self.authinfo_callback: return self.authinfo_callback(request, client_address) return None @@ -84,12 +83,11 @@ class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.BaseServer, SimpleXML ########################################################### -# Testing stuff +# Testing code only ########################################################### class ReqHandler: def ping(self, callerid, trynum): - print 'clearly not' print callerid print trynum return "pong %d / %d" % (callerid, trynum) diff --git a/func/overlord/client.py b/func/overlord/client.py index fb436ed..727746b 100755 --- a/func/overlord/client.py +++ b/func/overlord/client.py @@ -111,11 +111,11 @@ class Minions(object): seperate_gloobs = self.spec.split(";") seperate_gloobs = seperate_gloobs + self.new_hosts for each_gloob in seperate_gloobs: - actual_gloob = "%s/%s.cert" % (self.config.certroot, each_gloob) + actual_gloob = "%s/%s.%s" % (self.config.certroot, each_gloob, self.config.cert_extension) certs = glob.glob(actual_gloob) for cert in certs: self.all_certs.append(cert) - host = cert.replace(self.config.certroot,"")[1:-5] + host = cert.replace(self.config.certroot,"")[1:-(len(self.config.cert_extension) + 1)] self.all_hosts.append(host) return self.all_hosts diff --git a/func/overlord/cmd_modules/show.py b/func/overlord/cmd_modules/show.py index 92b094e..7eb9ec8 100644 --- a/func/overlord/cmd_modules/show.py +++ b/func/overlord/cmd_modules/show.py @@ -64,7 +64,8 @@ class ShowHardware(base_command.BaseCommand): class Show(base_command.BaseCommand): name = "show" - usage = "various simple report stuff" + usage = "show reports about minion info" + summary = usage subCommandClasses = [ShowHardware] def addOptions(self): self.parser.add_option("-v", "--verbose", dest="verbose", diff --git a/func/overlord/command.py b/func/overlord/command.py index 4b815f0..6e8e137 100644 --- a/func/overlord/command.py +++ b/func/overlord/command.py @@ -97,7 +97,7 @@ class Command: aliases = None usage = None summary = None - description = None + description = "func is the command line interface for controlling func minions" parentCommand = None subCommands = None subCommandClasses = None @@ -135,7 +135,7 @@ class Command: for name, command in self.subCommands.items(): formatter.addCommand(name, command.summary or command.description) - print formatter.format_description("") + # expand %command for the bottom usage usage = self.usage or self.name @@ -258,6 +258,7 @@ class Command: """ Output help information. """ + self.parser.print_help(file=self.stderr) def outputUsage(self): diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py index bd718bb..6e67ea4 100644 --- a/func/overlord/func_command.py +++ b/func/overlord/func_command.py @@ -30,7 +30,7 @@ from func.overlord import client class FuncCommandLine(command.Command): name = "func" - usage = "func is the command line interface for controlling func minions" + usage = "func [--options] \"hostname glob\" module method [arg1] [arg2] ... " subCommandClasses = [ call.Call, show.Show, copyfile.CopyFile, |