diff options
Diffstat (limited to 'src/zen/cmds/up_cmd.cpp')
| -rw-r--r-- | src/zen/cmds/up_cmd.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/zen/cmds/up_cmd.cpp b/src/zen/cmds/up_cmd.cpp index 3095211b6..0db5afb3b 100644 --- a/src/zen/cmds/up_cmd.cpp +++ b/src/zen/cmds/up_cmd.cpp @@ -86,14 +86,20 @@ UpCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) if (!Server.WaitUntilReady(Timeout)) { - ZEN_ERROR("zen server launch failed (timed out)"); - return 1; + if (Server.IsRunning()) + { + ZEN_ERROR("zen server launch failed (timed out), terminating"); + Server.Terminate(); + return 111; + } + int ReturnCode = Server.Shutdown(); + ZEN_CONSOLE("{}", Server.GetLogOutput()); + return ReturnCode; } else { ZEN_CONSOLE("zen server up"); } - return 0; } |