fix down command (#254)

* add option to zen down command to control port
* use correct port for shutdown even when attaching to running server
* changelog

1 files changed, 10 insertions, 6 deletions

diff --git a/zen/cmds/up.cpp b/zen/cmds/up.cpp
index 9fa1cdd8c..69bcbe829 100644
--- a/zen/cmds/up.cpp
+++ b/zen/cmds/up.cpp
@@ -46,6 +46,7 @@ UpCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 DownCommand::DownCommand()
 {
+	m_Options.add_option("", "p", "port", "Host port", cxxopts::value(m_Port)->default_value("1337"), "<hostport>");
 }
 
 DownCommand::~DownCommand() = default;
@@ -53,15 +54,17 @@ DownCommand::~DownCommand() = default;
 int
 DownCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 {
-	ZEN_UNUSED(GlobalOptions, argc, argv);
-
-	int ListenPort = 1337;
+	ZEN_UNUSED(GlobalOptions);
 
+	if (!ParseOptions(argc, argv))
+	{
+		return 0;
+	}
 	// Discover executing instances
 
 	ZenServerState Instance;
 	Instance.Initialize();
-	ZenServerState::ZenServerEntry* Entry = Instance.Lookup(ListenPort);
+	ZenServerState::ZenServerEntry* Entry = Instance.Lookup(m_Port);
 
 	if (!Entry)
 	{
@@ -77,9 +80,9 @@ DownCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		ZenServerEnvironment ServerEnvironment;
 		ServerEnvironment.Initialize(ExePath.parent_path());
 		ZenServerInstance Server(ServerEnvironment);
-		Server.AttachToRunningServer(ListenPort);
+		Server.AttachToRunningServer(m_Port);
 
-		ZEN_CONSOLE("attached to server on port {}, requesting shutdown", ListenPort);
+		ZEN_CONSOLE("attached to server on port {}, requesting shutdown", m_Port);
 
 		Server.Shutdown();
 
@@ -96,6 +99,7 @@ DownCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	// handle to determine when the server has shut down. Thus we signal that we would like
 	// a shutdown via the shutdown flag and then
 
+	ZEN_CONSOLE("requesting shutdown of server on port {}", m_Port);
 	Entry->SignalShutdownRequest();
 
 	return 0;