remove error warning in output (#695)

* changed some logging string so they don't get caught in CI logging

7 files changed, 20 insertions, 18 deletions

diff --git a/src/zen/cmds/print_cmd.cpp b/src/zen/cmds/print_cmd.cpp
index a4737e66d..030cc8b66 100644
--- a/src/zen/cmds/print_cmd.cpp
+++ b/src/zen/cmds/print_cmd.cpp
@@ -259,7 +259,7 @@ PrintPackageCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** ar
 	}
 	else
 	{
-		ZEN_ERROR("error: malformed package?");
+		ZEN_ERROR("Failed to load package, malformed package?");
 	}
 }
 
diff --git a/src/zen/zen.cpp b/src/zen/zen.cpp
index c47dc642f..4d4966222 100644
--- a/src/zen/zen.cpp
+++ b/src/zen/zen.cpp
@@ -738,13 +738,15 @@ main(int argc, char** argv)
 					}
 					else
 					{
-						ZEN_CONSOLE_ERROR("Operation failed due to system error: {} ({})\n", Ex.what(), Ex.code() ? Ex.code().value() : 0);
+						ZEN_CONSOLE_ERROR("Operation failed due to system exception: {} ({})\n",
+										  Ex.what(),
+										  Ex.code() ? Ex.code().value() : 0);
 						return (int)ReturnCode::kOtherError;
 					}
 				}
 				catch (const HttpClientError& Ex)
 				{
-					ZEN_CONSOLE_ERROR("Operation failed due to a http error: {}", Ex.what());
+					ZEN_CONSOLE_ERROR("Operation failed due to a http exception: {}", Ex.what());
 					ReturnCode Result = GetReturnCodeFromHttpResult(Ex);
 					return (int)Result;
 				}
@@ -789,13 +791,13 @@ main(int argc, char** argv)
 		}
 		else
 		{
-			printf("Operation failed due to system error: %s (%d)\n", Ex.what(), Ex.code() ? Ex.code().value() : 0);
+			printf("Operation failed due to system exception: %s (%d)\n", Ex.what(), Ex.code() ? Ex.code().value() : 0);
 			return (int)ReturnCode::kOtherError;
 		}
 	}
 	catch (const HttpClientError& Ex)
 	{
-		printf("Error: Operation failed due to a http error: %s", Ex.what());
+		printf("Operation failed due to a http exception: %s", Ex.what());
 		ReturnCode Result = GetReturnCodeFromHttpResult(Ex);
 		return (int)Result;
 	}
diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index 4a0edfd29..a0431b0b1 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -857,7 +857,7 @@ struct HttpAcceptor
 
 		if (BindErrorCode == asio::error::address_in_use)
 		{
-			ZEN_INFO("Desired port {} is in use (error: '{}'), retrying", EffectivePort, BindErrorCode.message());
+			ZEN_INFO("Desired port {} is in use (bind returned '{}'), retrying", EffectivePort, BindErrorCode.message());
 			Sleep(500);
 			m_Acceptor.bind(asio::ip::tcp::endpoint(BindAddress, EffectivePort), BindErrorCode);
 		}
@@ -873,7 +873,7 @@ struct HttpAcceptor
 
 			if (BindErrorCode)
 			{
-				ZEN_INFO("Unable to bind to preferred port range, falling back to automatic assignment (error: '{}')",
+				ZEN_INFO("Unable to bind to preferred port range, falling back to automatic assignment (bind returned '{}')",
 						 BindErrorCode.message());
 
 				EffectivePort = 0;
@@ -889,7 +889,7 @@ struct HttpAcceptor
 		{
 			for (uint32_t Retries = 0; (BindErrorCode == asio::error::address_in_use) && (Retries < 3); Retries++)
 			{
-				ZEN_INFO("Desired port {} is in use (error: '{}'), retrying", EffectivePort, BindErrorCode.message());
+				ZEN_INFO("Desired port {} is in use (bind returned '{}'), retrying", EffectivePort, BindErrorCode.message());
 				Sleep(500);
 				m_Acceptor.bind(asio::ip::tcp::endpoint(BindAddress, EffectivePort), BindErrorCode);
 			}
@@ -897,7 +897,7 @@ struct HttpAcceptor
 
 		if (BindErrorCode)
 		{
-			ZEN_WARN("Unable to initialize asio service, (error: '{}')", BindErrorCode.message());
+			ZEN_WARN("Unable to initialize asio service, (bind returned '{}')", BindErrorCode.message());
 
 			return 0;
 		}
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index 87b66dcd1..c555a39b6 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -1082,7 +1082,7 @@ HttpSysServer::InitializeServer(int BasePort)
 
 		if ((Result == ERROR_SHARING_VIOLATION))
 		{
-			ZEN_INFO("Desired port {} is in use (error: '{}'), retrying", EffectivePort, Result);
+			ZEN_INFO("Desired port {} is in use (HttpAddUrlToUrlGroup returned: {}), retrying", EffectivePort, Result);
 			Sleep(500);
 			Result = HttpAddUrlToUrlGroup(m_HttpUrlGroupId, WildcardUrlPath.c_str(), HTTP_URL_CONTEXT(0), 0);
 
@@ -1104,7 +1104,7 @@ HttpSysServer::InitializeServer(int BasePort)
 				{
 					for (uint32_t Retries = 0; (Result == ERROR_SHARING_VIOLATION) && (Retries < 3); Retries++)
 					{
-						ZEN_INFO("Desired port {} is in use (error: '{}'), retrying", EffectivePort, Result);
+						ZEN_INFO("Desired port {} is in use (HttpAddUrlToUrlGroup returned: {}), retrying", EffectivePort, Result);
 						Sleep(500);
 						Result = HttpAddUrlToUrlGroup(m_HttpUrlGroupId, WildcardUrlPath.c_str(), HTTP_URL_CONTEXT(0), 0);
 					}
@@ -1577,7 +1577,7 @@ HttpSysTransaction::IssueNextRequest(HttpSysRequestHandler* NewCompletionHandler
 			return true;
 		}
 
-		ZEN_WARN("IssueRequest() failed: {}", ErrorCode.message());
+		ZEN_WARN("IssueRequest() failed: '{}'", ErrorCode.message());
 	}
 	catch (const AssertException& AssertEx)
 	{
@@ -1979,11 +1979,11 @@ InitialRequestHandler::IssueRequest(std::error_code& ErrorCode)
 
 		if (IsInitialRequest())
 		{
-			ZEN_WARN("initial HttpReceiveHttpRequest failed, error: {}", ErrorCode.message());
+			ZEN_WARN("initial HttpReceiveHttpRequest failed: '{}'", ErrorCode.message());
 		}
 		else
 		{
-			ZEN_WARN("HttpReceiveHttpRequest (offset: {}, content-length: {}) failed, error: {}",
+			ZEN_WARN("HttpReceiveHttpRequest (offset: {}, content-length: {}) failed: '{}'",
 					 m_CurrentPayloadOffset,
 					 m_PayloadBuffer.GetSize(),
 					 ErrorCode.message());
diff --git a/src/zenserver/config/luaconfig.cpp b/src/zenserver/config/luaconfig.cpp
index 61969019c..52c652561 100644
--- a/src/zenserver/config/luaconfig.cpp
+++ b/src/zenserver/config/luaconfig.cpp
@@ -254,7 +254,7 @@ Options::Parse(const std::filesystem::path& Path, const cxxopts::ParseResult& Cm
 
 				std::string ErrorString = sol::to_string(config.status());
 
-				throw std::runtime_error(fmt::format("{} error: {}", ErrorString, err.what()));
+				throw std::runtime_error(fmt::format("{} ('{}')", ErrorString, err.what()));
 			}
 
 			config();
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 93a01d9d7..559695a94 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -475,7 +475,7 @@ ZenStorageServer::InitializeState(const ZenStorageServerConfig& ServerOptions)
 
 				if (Ec)
 				{
-					ZEN_WARN("Delete of '{}' returned error: '{}'", DirEntry.path(), Ec.message());
+					ZEN_WARN("Delete of '{}' failed: '{}'", DirEntry.path(), Ec.message());
 				}
 			}
 		}
diff --git a/src/zenstore/projectstore.cpp b/src/zenstore/projectstore.cpp
index 657d2ca64..f1001f665 100644
--- a/src/zenstore/projectstore.cpp
+++ b/src/zenstore/projectstore.cpp
@@ -817,7 +817,7 @@ struct ProjectStore::OplogStorage : public RefCounted
 					}
 					else
 					{
-						ZEN_WARN("oplog '{}/{}': skipping invalid format op - {}. Validation error: {}",
+						ZEN_WARN("oplog '{}/{}': skipping invalid format op - {}. Validation failure: '{}'",
 								 m_OwnerOplog->GetOuterProjectIdentifier(),
 								 m_OwnerOplog->OplogId(),
 								 Entry.Lsn.Number,
@@ -850,7 +850,7 @@ struct ProjectStore::OplogStorage : public RefCounted
 					}
 					else
 					{
-						ZEN_WARN("oplog '{}/{}': skipping invalid format op - {}. Validation error: {}",
+						ZEN_WARN("oplog '{}/{}': skipping invalid format op - {}. Validation failure: '{}'",
 								 m_OwnerOplog->GetOuterProjectIdentifier(),
 								 m_OwnerOplog->OplogId(),
 								 Entry.Lsn.Number,