logging control via registry

Author: planetchili

IntelPresentMon/CommonUtilities/reg/Registry.h

@@ -104,6 +104,10 @@ namespace pmon::util::reg
 			}
 			bool Exists() const
 			{
+				if (!parent_.key_.IsValid()) {
+					pmlog_warn(ReportException("Attempting to check validity of value whose key is not open"));
+					return false;
+				}
 				for (auto& v : parent_.key_.EnumValues()) {
 					if (v.first == valueName_) {
 						return true;

IntelPresentMon/PresentMonService/LogSetup.cpp

@@ -17,6 +17,7 @@
 #include "../CommonUtilities/str/String.h"
 #include "../CommonUtilities/Exception.h"
 #include "CliOptions.h"
+#include "Registry.h"
 
 namespace pmon::util::log
 {
@@ -63,23 +64,25 @@ namespace logsetup
 	void ConfigureLogging(bool asApp) noexcept
 	{
 		try {
-			// shortcut for command line
+			// shortcuts for command line and registry
 			const auto& opt = clio::Options::Get();
+			const auto& reg = Reg::Get();
 			// get the channel
 			auto pChannel = GetDefaultChannel();
 			// configure logging based on command line
-			if (opt.logLevel) {
-				GlobalPolicy::Get().SetLogLevel(*opt.logLevel);
+			if (opt.logLevel || reg.logLevel.Exists()) {
+				GlobalPolicy::Get().SetLogLevel(opt.logLevel ? *opt.logLevel : reg.logLevel);
 			}
 			if (!opt.enableStdioLog) {
 				pChannel->AttachComponent({}, "drv:std");
 			}
 			if (!opt.enableDebuggerLog) {
 				pChannel->AttachComponent({}, "drv:dbg");
 			}
-			if (opt.logDir) {
+			if (opt.logDir || reg.logDir.Exists()) {
+				const auto dir = opt.logDir ? *opt.logDir : reg.logDir;
 				const std::chrono::zoned_time now{ std::chrono::current_zone(), std::chrono::system_clock::now() };
-				auto fullPath = std::format("{0}\\pmsvc-log-{1:%y}{1:%m}{1:%d}-{1:%H}{1:%M}{1:%OS}.txt", *opt.logDir, now);
+				auto fullPath = std::format("{0}\\pmsvc-log-{1:%y}{1:%m}{1:%d}-{1:%H}{1:%M}{1:%OS}.txt", dir, now);
 				pChannel->AttachComponent(std::make_shared<BasicFileDriver>( std::make_shared<TextFormatter>(),
 					std::make_shared<SimpleFileStrategy>(fullPath)), "drv:file");
 			}

IntelPresentMon/PresentMonService/ServiceMain.cpp

@@ -19,10 +19,10 @@ int CommonEntry(DWORD argc, LPTSTR* argv, bool asApp)
 	if (auto e = clio::Options::Init(argc, argv); e && asApp) {
 		return *e;
 	}
-	// configure logging based on CLI arguments
-	logsetup::ConfigureLogging(asApp);
 	// configure windows registry access
 	Reg::SetPrivileged(!asApp);
+	// configure logging based on CLI arguments and registry settings
+	logsetup::ConfigureLogging(asApp);
 
 	if (asApp) {
 		auto& svc = ConsoleDebugMockService::Get();