From e44740f9bf2846e69e8c01d7b1f7a7b8545af6b6 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 8 Sep 2021 19:10:59 +0200
Subject: Moved a bunch of logging code into zencore

---
 zenserver/config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'zenserver/config.cpp')

diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index 904e613a4..665c567cc 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -178,14 +178,14 @@ ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, Z
 
 		if (result.count("help"))
 		{
-			ConsoleLog().info("{}", options.help());
+			zen::logging::ConsoleLog().info("{}", options.help());
 
 			exit(0);
 		}
 	}
 	catch (cxxopts::OptionParseException& e)
 	{
-		ConsoleLog().error("Error parsing zenserver arguments: {}\n\n{}", e.what(), options.help());
+		zen::logging::ConsoleLog().error("Error parsing zenserver arguments: {}\n\n{}", e.what(), options.help());
 
 		throw;
 	}
-- 
cgit v1.2.3


From 891b85a08ff008febf267c581dd072b1cc1be395 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 8 Sep 2021 19:11:46 +0200
Subject: Mesh should not default to on

---
 zenserver/config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zenserver/config.cpp')

diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index 665c567cc..ddef83c02 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -85,7 +85,7 @@ ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, Z
 					   "m",
 					   "mesh",
 					   "Enable mesh network",
-					   cxxopts::value<bool>(ServiceConfig.MeshEnabled)->default_value("true"),
+					   cxxopts::value<bool>(ServiceConfig.MeshEnabled)->default_value("false"),
 					   "");
 
 	options.add_option("diagnostics",
-- 
cgit v1.2.3