refactor zen command return value handling (#487)

- Improvement: Use consistent language for command line argument parsing errors
- Improvement: Changed zen command parsing errors to output help first and error last to make it easier to spot the error
- Improvement: Refactor zen command return codes to conform to valid Linux range (0-255)

        kSuccess     = 0,
        kOtherError  = 1,
        kBadInput    = 2,

        kOutOfMemory = 16,
        kOutOfDisk   = 17,

        kAssertError = 70,
        
        kHttpOtherClientError = 80,
        kHttpCantConnectError = 81,
        kHttpNotFound         = 66,  // NotFound(404)
        kHttpUnauthorized     = 77,  // Unauthorized(401),
        kHttpSLLError         = 82,
        kHttpForbidden        = 83,  // Forbidden(403)
        kHttpTimeout          = 84,  // RequestTimeout(408)
        kHttpConflict         = 85,  // Conflict(409)
        kHttpNoHost           = 86,
        
        kHttpOtherServerError	   = 90,
        kHttpInternalServerError = 91,  // InternalServerError(500)
        kHttpServiceUnavailable  = 69,  // ServiceUnavailable(503)
        kHttpBadGateway          = 92,  // BadGateway(502)
        kHttpGatewayTimeout      = 93,  // GatewayTimeout(504)

1 files changed, 7 insertions, 11 deletions

diff --git a/src/zen/cmds/status_cmd.cpp b/src/zen/cmds/status_cmd.cpp
index 5b172f1a5..c43f85052 100644
--- a/src/zen/cmds/status_cmd.cpp
+++ b/src/zen/cmds/status_cmd.cpp
@@ -20,14 +20,14 @@ StatusCommand::StatusCommand()
 
 StatusCommand::~StatusCommand() = default;
 
-int
+void
 StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 {
 	ZEN_UNUSED(GlobalOptions);
 
 	if (!ParseOptions(argc, argv))
 	{
-		return 0;
+		return;
 	}
 
 	uint16_t EffectivePort = 0;
@@ -35,8 +35,7 @@ StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	{
 		if (!IsFile(m_DataDir / ".lock"))
 		{
-			ZEN_CONSOLE_ERROR("Lock file does not exist in directory '{}'", m_DataDir);
-			return 1;
+			throw std::runtime_error(fmt::format("Lock file does not exist in directory '{}'", m_DataDir));
 		}
 		CbValidateError ValidateResult = CbValidateError::None;
 		if (CbObject LockFileObject =
@@ -47,15 +46,14 @@ StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			std::string	 Reason;
 			if (!ValidateLockFileInfo(Info, Reason))
 			{
-				ZEN_CONSOLE_ERROR("Lock file in directory '{}' is not valid. Reason: '{}'", m_DataDir, Reason);
-				return 1;
+				throw std::runtime_error(fmt::format("Lock file in directory '{}' is not valid. Reason: '{}'", m_DataDir, Reason));
 			}
 			EffectivePort = Info.EffectiveListenPort;
 		}
 		else
 		{
-			ZEN_CONSOLE_ERROR("Lock file in directory '{}' is not valid. Reason: '{}'", m_DataDir, ToString(ValidateResult));
-			return 1;
+			throw std::runtime_error(
+				fmt::format("Lock file in directory '{}' is malformed. Reason: '{}'", m_DataDir, ToString(ValidateResult)));
 		}
 	}
 
@@ -63,7 +61,7 @@ StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	if (!State.InitializeReadOnly())
 	{
 		ZEN_CONSOLE("No Zen state found");
-		return 0;
+		return;
 	}
 
 	ZEN_CONSOLE("{:>5} {:>6} {:>24}", "port", "pid", "session");
@@ -78,8 +76,6 @@ StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			ZEN_CONSOLE("{:>5} {:>6} {:>24}", Entry.EffectiveListenPort.load(), Entry.Pid.load(), SessionStringBuilder);
 		}
 	});
-
-	return 0;
 }
 
 }  // namespace zen