瀏覽代碼

Add more friendly usage info to the celeryd-multi command.

Vincent Driessen 15 年之前
父節點
當前提交
2c6810d781
共有 1 個文件被更改,包括 12 次插入2 次删除
  1. 12 2
      celery/bin/celeryd_multi.py

+ 12 - 2
celery/bin/celeryd_multi.py

@@ -222,10 +222,20 @@ COMMANDS = {"start": start,
             "get": get,
             "get": get,
             "help": help}
             "help": help}
 
 
+def usage():
+    print("Please use one of the following commands: %s" % ", ".join(COMMANDS.keys()))
 
 
 def celeryd_multi(argv, cmd="celeryd"):
 def celeryd_multi(argv, cmd="celeryd"):
-    return COMMANDS[argv[0]](argv[1:], cmd)
-
+    if len(argv) == 0:
+        usage()
+        sys.exit(0)
+
+    try:
+        return COMMANDS[argv[0]](argv[1:], cmd)
+    except KeyError, e:
+        print("Invalid command: %s" % argv[0])
+        usage()
+        sys.exit(1)
 
 
 def main():
 def main():
     celeryd_multi(sys.argv[1:])
     celeryd_multi(sys.argv[1:])