clang-format

25 files changed, 47 insertions, 31 deletions

diff --git a/zen/cmds/copy.cpp b/zen/cmds/copy.cpp
index 6b3965f99..947d54e07 100644
--- a/zen/cmds/copy.cpp
+++ b/zen/cmds/copy.cpp
@@ -97,4 +97,4 @@ CopyCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/copy.h b/zen/cmds/copy.h
index c2a7fd23b..322cf3f2f 100644
--- a/zen/cmds/copy.h
+++ b/zen/cmds/copy.h
@@ -25,4 +25,4 @@ private:
 	bool					 m_NoClone = false;
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/dedup.cpp b/zen/cmds/dedup.cpp
index f95a87518..e71314622 100644
--- a/zen/cmds/dedup.cpp
+++ b/zen/cmds/dedup.cpp
@@ -293,4 +293,4 @@ DedupCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/dedup.h b/zen/cmds/dedup.h
index c955d4bbd..7932d10e6 100644
--- a/zen/cmds/dedup.h
+++ b/zen/cmds/dedup.h
@@ -27,4 +27,4 @@ private:
 	size_t					 m_SizeThreshold = 1024 * 1024;
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/deploy.cpp b/zen/cmds/deploy.cpp
index faaf0030c..d60392dd5 100644
--- a/zen/cmds/deploy.cpp
+++ b/zen/cmds/deploy.cpp
@@ -83,4 +83,4 @@ DeployCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/deploy.h b/zen/cmds/deploy.h
index 565e11bf3..975caf9e9 100644
--- a/zen/cmds/deploy.h
+++ b/zen/cmds/deploy.h
@@ -26,4 +26,4 @@ private:
 	bool					 m_IsClean = false;
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/hash.cpp b/zen/cmds/hash.cpp
index e9484c453..0a7989ffc 100644
--- a/zen/cmds/hash.cpp
+++ b/zen/cmds/hash.cpp
@@ -126,4 +126,4 @@ HashCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/hash.h b/zen/cmds/hash.h
index 8ed8e9fa3..3df9063ea 100644
--- a/zen/cmds/hash.h
+++ b/zen/cmds/hash.h
@@ -26,4 +26,4 @@ private:
 	std::string		 m_OutputFile;
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/run.cpp b/zen/cmds/run.cpp
index 711a3a341..ceeb4ddae 100644
--- a/zen/cmds/run.cpp
+++ b/zen/cmds/run.cpp
@@ -184,4 +184,4 @@ RunCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/run.h b/zen/cmds/run.h
index f4eb4ef76..3e1e3f2b2 100644
--- a/zen/cmds/run.h
+++ b/zen/cmds/run.h
@@ -23,4 +23,4 @@ private:
 	std::string		 m_ExeTree;
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/scrub.cpp b/zen/cmds/scrub.cpp
index 73d2b45ee..c0fe8ca61 100644
--- a/zen/cmds/scrub.cpp
+++ b/zen/cmds/scrub.cpp
@@ -31,7 +31,7 @@ GcCommand::~GcCommand()
 {
 }
 
-int 
+int
 GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 {
 	ZEN_UNUSED(GlobalOptions, argc, argv);
@@ -39,4 +39,4 @@ GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/scrub.h b/zen/cmds/scrub.h
index a3f25c259..561ae578d 100644
--- a/zen/cmds/scrub.h
+++ b/zen/cmds/scrub.h
@@ -36,4 +36,4 @@ private:
 	cxxopts::Options m_Options{"gc", "Garbage collect zen storage"};
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/status.cpp b/zen/cmds/status.cpp
index 1050b5b96..10970e3c2 100644
--- a/zen/cmds/status.cpp
+++ b/zen/cmds/status.cpp
@@ -20,4 +20,4 @@ StatusCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/status.h b/zen/cmds/status.h
index f2c68b96a..acde280c5 100644
--- a/zen/cmds/status.h
+++ b/zen/cmds/status.h
@@ -19,4 +19,4 @@ private:
 	cxxopts::Options m_Options{"status", "Show zen status"};
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/top.cpp b/zen/cmds/top.cpp
index 3ff7edcda..3e3942d31 100644
--- a/zen/cmds/top.cpp
+++ b/zen/cmds/top.cpp
@@ -2,9 +2,9 @@
 
 #include "top.h"
 
+#include <zencore/fmtutils.h>
 #include <zencore/logging.h>
 #include <zencore/uid.h>
-#include <zencore/fmtutils.h>
 #include <zenutil/zenserverprocess.h>
 
 #include <memory>
@@ -32,7 +32,7 @@ TopCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		return 0;
 	}
 
-	int n = 0;
+	int		  n			   = 0;
 	const int HeaderPeriod = 20;
 
 	for (;;)
@@ -42,14 +42,15 @@ TopCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			ZEN_CONSOLE("{:>5} {:>6} {:>24}", "port", "pid", "session");
 		}
 
-		State.Snapshot([&](const ZenServerState::ZenServerEntry& Entry) { ZEN_CONSOLE("{:5} {:6} {:24}", Entry.ListenPort, Entry.Pid, Entry.GetSessionId()); });
+		State.Snapshot([&](const ZenServerState::ZenServerEntry& Entry) {
+			ZEN_CONSOLE("{:5} {:6} {:24}", Entry.ListenPort, Entry.Pid, Entry.GetSessionId());
+		});
 
 		zen::Sleep(1000);
 
 		State.Sweep();
 	}
 
-
 	return 0;
 }
 
@@ -79,4 +80,4 @@ PsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/top.h b/zen/cmds/top.h
index a842089ff..d8bf91a1c 100644
--- a/zen/cmds/top.h
+++ b/zen/cmds/top.h
@@ -32,4 +32,4 @@ private:
 	cxxopts::Options m_Options{"ps", "Enumerate running Zen server instances"};
 };
 
-}
+}  // namespace zen
diff --git a/zen/cmds/up.cpp b/zen/cmds/up.cpp
index 048133fc9..17cba3794 100644
--- a/zen/cmds/up.cpp
+++ b/zen/cmds/up.cpp
@@ -101,4 +101,4 @@ DownCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	return 0;
 }
 
-}
+}  // namespace zen
diff --git a/zen/cmds/up.h b/zen/cmds/up.h
index fda62693a..fe1ed7a0c 100644
--- a/zen/cmds/up.h
+++ b/zen/cmds/up.h
@@ -32,4 +32,4 @@ private:
 	cxxopts::Options m_Options{"down", "Bring down zen service"};
 };
 
-}
+}  // namespace zen
diff --git a/zen/zen.cpp b/zen/zen.cpp
index 6390c832f..9c373face 100644
--- a/zen/zen.cpp
+++ b/zen/zen.cpp
@@ -42,7 +42,6 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-
 class TemplateCommand : public ZenCmdBase
 {
 public:
@@ -125,7 +124,7 @@ main(int argc, char** argv)
 		ZenCmdBase* Cmd;
 		const char* CmdSummary;
 	} Commands[] = {
-	// clang-format off
+		// clang-format off
 		{"chunk",		&ChunkCmd,		"Perform chunking"},
 		{"copy",		&CopyCmd,		"Copy file(s)"},
 		{"deploy",		&DeployCmd,		"Deploy data"},
@@ -139,7 +138,7 @@ main(int argc, char** argv)
 		{"top",			&TopCmd,		"Monitor zen server activity"},
 		{"up",			&UpCmd,			"Bring zen server up"},
 		{"down",		&DownCmd,		"Bring zen server down"},
-	// clang-format on
+		// clang-format on
 	};
 
 	// Build set containing available commands
diff --git a/zen/zen.vcxproj b/zen/zen.vcxproj
index ff10f4c59..fb0674e87 100644
--- a/zen/zen.vcxproj
+++ b/zen/zen.vcxproj
@@ -136,6 +136,9 @@
       <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/zen/zen.vcxproj.filters b/zen/zen.vcxproj.filters
index a38771944..9002f01c2 100644
--- a/zen/zen.vcxproj.filters
+++ b/zen/zen.vcxproj.filters
@@ -63,4 +63,7 @@
       <UniqueIdentifier>{2e06a54c-52be-4260-9275-a4232d01a53c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h
index 14f915e76..8011ab241 100644
--- a/zencore/include/zencore/zencore.h
+++ b/zencore/include/zencore/zencore.h
@@ -158,7 +158,7 @@ ZENCORE_API void RequestApplicationExit(int ExitCode);
 ZENCORE_API bool IsDebuggerPresent();
 ZENCORE_API void zencore_forcelinktests();
 
-}
+}  // namespace zen
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 48bbacd80..17b8b76eb 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -670,7 +670,7 @@ main(int argc, char** argv)
 	zen::logging::InitializeLogging();
 
 	spdlog::set_level(spdlog::level::debug);
-	spdlog::set_formatter(std::make_unique<::logging::full_formatter>("test", std::chrono::system_clock::now()));
+	spdlog::set_formatter(std::make_unique< ::logging::full_formatter>("test", std::chrono::system_clock::now()));
 
 	std::filesystem::path ProgramBaseDir = std::filesystem::path(argv[0]).parent_path();
 	std::filesystem::path TestBaseDir	 = ProgramBaseDir.parent_path().parent_path() / ".test";
@@ -1773,5 +1773,5 @@ TEST_CASE("lifetime.owner.2")
 }
 #	endif
 
-}
+}  // namespace zen::tests
 #endif
diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp
index 4ba4835af..48c87dd68 100644
--- a/zenserver/diag/logging.cpp
+++ b/zenserver/diag/logging.cpp
@@ -9,6 +9,7 @@
 #include <spdlog/pattern_formatter.h>
 #include <spdlog/sinks/ansicolor_sink.h>
 #include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/sinks/msvc_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 #include <zencore/string.h>
@@ -207,7 +208,7 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 	if (GlobalOptions.IsTest)
 	{
 		LogLevel = spdlog::level::trace;
-		IsAsync = false;
+		IsAsync	 = false;
 	}
 
 	if (IsAsync)
@@ -234,6 +235,15 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 	Sinks.push_back(ConsoleSink);
 	Sinks.push_back(FileSink);
 
+#if ZEN_PLATFORM_WINDOWS
+	if (zen::IsDebuggerPresent())
+	{
+		auto DebugSink = std::make_shared<spdlog::sinks::msvc_sink_mt>();
+		DebugSink->set_level(spdlog::level::debug);
+		Sinks.push_back(DebugSink);
+	}
+#endif
+
 	// Jupiter - only log HTTP traffic to file
 
 	auto JupiterLogger = std::make_shared<spdlog::logger>("jupiter", FileSink);
diff --git a/zenutil/include/zenutil/zenserverprocess.h b/zenutil/include/zenutil/zenserverprocess.h
index f0924f048..005f7adff 100644
--- a/zenutil/include/zenutil/zenserverprocess.h
+++ b/zenutil/include/zenutil/zenserverprocess.h
@@ -131,4 +131,4 @@ private:
 	ZenServerEntry* m_OurEntry		= nullptr;
 };
 
-}
+}  // namespace zen