diff --git a/cmd/warren/cmd_warrend.go b/cmd/warren/cmd_warrend.go index 83f4b7e..72c78ec 100644 --- a/cmd/warren/cmd_warrend.go +++ b/cmd/warren/cmd_warrend.go @@ -27,16 +27,26 @@ var unregCmd = &warren.Command{ Run: warrendRun, } -var statusUsage = ` -warren status - Get the status from the warrend server +var listUsage = ` +warren list - Get the status from the warrend server ` -var statusCmd = &warren.Command{ - Name: "status", - Usage: statusUsage, - Summary: "Get the status from the warrend server", +var listCmd = &warren.Command{ + Name: "list", + Usage: listUsage, + Summary: "Get a list of deployments from the warrend server", Run: warrendRun, } +var poolUsage = ` +warren pool - Get/set the pool range for a deployment +` +var poolCmd = &warren.Command{ + Name: "pool", + Usage: poolUsage, + Summary: "warren pool - Get/set the pool range for a deployment", + Run: warrendRun, +} + func warrendRun(cmd *warren.Command, args ...string) { s, err := net.Dial(warren.CmdSockType, warren.CmdSockAddr) diff --git a/cmd/warren/main.go b/cmd/warren/main.go index afb5a20..9675eb5 100644 --- a/cmd/warren/main.go +++ b/cmd/warren/main.go @@ -25,9 +25,10 @@ func usage() { func main() { warren.RegisterCommand(buildCmd) warren.RegisterCommand(deployCmd) - warren.RegisterCommand(statusCmd) + warren.RegisterCommand(listCmd) warren.RegisterCommand(regCmd) warren.RegisterCommand(unregCmd) + warren.RegisterCommand(poolCmd) warren.RegisterCommand(versionCmd) args := os.Args[1:] if len(args) == 0 || args[0] == "-h" { diff --git a/cmd/warrend/cmd_status.go b/cmd/warrend/cmd_list.go similarity index 55% rename from cmd/warrend/cmd_status.go rename to cmd/warrend/cmd_list.go index 8fa1eb4..6ba349c 100644 --- a/cmd/warrend/cmd_status.go +++ b/cmd/warrend/cmd_list.go @@ -6,26 +6,26 @@ import ( "net" ) -var statusUsage = ` -status - +var listUsage = ` +list - ` -var statusCmd = &SockCommand{ +var listCmd = &SockCommand{ Command: warren.Command{ - Name: "status", - Usage: statusUsage, - Summary: "Print status of warrend", + Name: "list", + Usage: listUsage, + Summary: "Print list of warren deployments", }, - Run: statusRun, + Run: listRun, } -func statusRun(cmd *SockCommand, c net.Conn, path string, args ...string) { +func listRun(cmd *SockCommand, c net.Conn, path string, args ...string) { if len(args) > 0 && args[0] == "help" { warren.WriteStringz(c, cmd.Usage) return } - warren.WriteStringz(c, "Status\n") + warren.WriteStringz(c, "List\n") for n, p := range conf.GetConf().Deployments { warren.WriteStringz(c, n+": "+p+"\n") diff --git a/cmd/warrend/main.go b/cmd/warrend/main.go index f569d67..459a0b8 100644 --- a/cmd/warrend/main.go +++ b/cmd/warrend/main.go @@ -130,7 +130,7 @@ func main() { initRunning() - warren.RegisterCommand(statusCmd) + warren.RegisterCommand(listCmd) warren.RegisterCommand(regCmd) warren.RegisterCommand(unregCmd)