Merge branch 'main' into lm/restrict-content-type

1 files changed, 77 insertions, 0 deletions

diff --git a/src/zenutil/config/loggingconfig.cpp b/src/zenutil/config/loggingconfig.cpp
new file mode 100644
index 000000000..5092c60aa
--- /dev/null
+++ b/src/zenutil/config/loggingconfig.cpp
@@ -0,0 +1,77 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "zenutil/config/loggingconfig.h"
+
+#include <zenbase/zenbase.h>
+#include <zencore/filesystem.h>
+#include <zencore/logging.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <cxxopts.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
+
+namespace zen {
+
+void
+ZenLoggingCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenLoggingConfig& LoggingConfig)
+{
+	// clang-format off
+	options.add_options("logging")
+		("abslog",			"Path to log file",											cxxopts::value<std::string>(m_AbsLogFile))
+		("log-id",			"Specify id for adding context to log output",				cxxopts::value<std::string>(LoggingConfig.LogId))
+		("quiet",			"Configure console logger output to level WARN",			cxxopts::value<bool>(LoggingConfig.QuietConsole)->default_value("false"))
+		("noconsole",		"Disable console logging",									cxxopts::value<bool>(LoggingConfig.NoConsoleOutput)->default_value("false"))
+		("log-trace", 		"Change selected loggers to level TRACE", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Trace]))
+		("log-debug", 		"Change selected loggers to level DEBUG", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Debug]))
+		("log-info", 		"Change selected loggers to level INFO", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Info]))
+		("log-warn", 		"Change selected loggers to level WARN", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Warn]))
+		("log-error", 		"Change selected loggers to level ERROR", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Err]))
+		("log-critical", 	"Change selected loggers to level CRITICAL", 				cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Critical]))
+		("log-off", 		"Change selected loggers to level OFF", 					cxxopts::value<std::string>(LoggingConfig.Loggers[logging::Off]))
+		("otlp-endpoint", 	"OpenTelemetry endpoint URI (e.g http://localhost:4318)", 	cxxopts::value<std::string>(LoggingConfig.OtelEndpointUri))
+	;
+	// clang-format on
+}
+
+void
+ZenLoggingCmdLineOptions::ApplyOptions(ZenLoggingConfig& LoggingConfig)
+{
+	LoggingConfig.AbsLogFile = MakeSafeAbsolutePath(m_AbsLogFile);
+}
+
+void
+ApplyLoggingOptions(cxxopts::Options& options, ZenLoggingConfig& LoggingConfig)
+{
+	ZEN_UNUSED(options);
+
+	if (LoggingConfig.QuietConsole)
+	{
+		bool HasExplicitConsoleLevel = false;
+		for (int i = 0; i < logging::LogLevelCount; ++i)
+		{
+			if (LoggingConfig.Loggers[i].find("console") != std::string::npos)
+			{
+				HasExplicitConsoleLevel = true;
+				break;
+			}
+		}
+
+		if (!HasExplicitConsoleLevel)
+		{
+			std::string& WarnLoggers = LoggingConfig.Loggers[logging::Warn];
+			if (!WarnLoggers.empty())
+			{
+				WarnLoggers += ",";
+			}
+			WarnLoggers += "console";
+		}
+	}
+
+	for (int i = 0; i < logging::LogLevelCount; ++i)
+	{
+		logging::ConfigureLogLevels(logging::LogLevel(i), LoggingConfig.Loggers[i]);
+	}
+	logging::RefreshLogLevels();
+}
+
+}  // namespace zen