remove some spurious cpr includes

5 files changed, 41 insertions, 34 deletions

diff --git a/src/zen/cmds/projectstore_cmd.cpp b/src/zen/cmds/projectstore_cmd.cpp
index 5f0f52f7c..f99e93cd1 100644
--- a/src/zen/cmds/projectstore_cmd.cpp
+++ b/src/zen/cmds/projectstore_cmd.cpp
@@ -17,7 +17,6 @@
 #include <zenhttp/httpcommon.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
-#include <cpr/cpr.h>
 #include <json11.hpp>
 ZEN_THIRD_PARTY_INCLUDES_END
 
diff --git a/src/zen/cmds/version_cmd.cpp b/src/zen/cmds/version_cmd.cpp
index 1be02331d..eda6e6725 100644
--- a/src/zen/cmds/version_cmd.cpp
+++ b/src/zen/cmds/version_cmd.cpp
@@ -13,10 +13,6 @@
 
 #include <memory>
 
-ZEN_THIRD_PARTY_INCLUDES_START
-#include <cpr/cpr.h>
-ZEN_THIRD_PARTY_INCLUDES_END
-
 namespace zen {
 
 using namespace std::literals;
diff --git a/src/zen/zen.cpp b/src/zen/zen.cpp
index 240ba2a81..6aa278947 100644
--- a/src/zen/zen.cpp
+++ b/src/zen/zen.cpp
@@ -12,6 +12,7 @@
 #include "cmds/copy_cmd.h"
 #include "cmds/dedup_cmd.h"
 #include "cmds/info_cmd.h"
+#include "cmds/master_cmd.h"
 #include "cmds/print_cmd.h"
 #include "cmds/projectstore_cmd.h"
 #include "cmds/rpcreplay_cmd.h"
@@ -671,6 +672,7 @@ main(int argc, char** argv)
 	ImportOplogCommand		 ImportOplogCmd;
 	InfoCommand				 InfoCmd;
 	JobCommand				 JobCmd;
+	MasterCommand			 MasterCmd;
 	OplogMirrorCommand		 OplogMirrorCmd;
 	SnapshotOplogCommand	 SnapshotOplogCmd;
 	OplogValidateCommand	 OplogValidateCmd;
@@ -724,6 +726,7 @@ main(int argc, char** argv)
 		{"info",								&InfoCmd,					"Show high level Zen server information"},
 		{"jobs",								&JobCmd,					"Show/cancel zen background jobs"},
 		{"logs",								&LoggingCmd,				"Show/control zen logging"},
+		{MasterCommand::Name,								&MasterCmd,					MasterCommand::Description},
 		{"oplog-create",						&CreateOplogCmd,			"Create a project oplog"},
 		{"oplog-export",						&ExportOplogCmd,			"Export project store oplog"},
 		{"oplog-import",						&ImportOplogCmd,			"Import project store oplog"},
diff --git a/src/zenmaster/zenmaster.cpp b/src/zenmaster/zenmaster.cpp
index c9576e4a4..9f71c1a5d 100644
--- a/src/zenmaster/zenmaster.cpp
+++ b/src/zenmaster/zenmaster.cpp
@@ -41,39 +41,50 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <zencore/memory/newdelete.h>
 
-#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
+//////////////////////////////////////////////////////////////////////////
+
+#if ZEN_PLATFORM_WINDOWS
+#	include <conio.h>
+#else
 #	include <sys/ioctl.h>
 #	include <unistd.h>
 #	include <termios.h>
-
-char getch(void)
-{
-    char buf = 0;
-    struct termios old = {0};
-    fflush(stdout);
-    if(tcgetattr(0, &old) < 0)
-        perror("tcsetattr()");
-    old.c_lflag &= ~ICANON;
-    old.c_lflag &= ~ECHO;
-    old.c_cc[VMIN] = 1;
-    old.c_cc[VTIME] = 0;
-    if(tcsetattr(0, TCSANOW, &old) < 0)
-        perror("tcsetattr ICANON");
-    if(read(0, &buf, 1) < 0)
-        perror("read()");
-    old.c_lflag |= ICANON;
-    old.c_lflag |= ECHO;
-    if(tcsetattr(0, TCSADRAIN, &old) < 0)
-        perror("tcsetattr ~ICANON");
-    return buf;
- }
- #endif
-
-//////////////////////////////////////////////////////////////////////////
+#endif
 
 namespace zen {
 
+#if ZEN_PLATFORM_WINDOWS
+int
+getch(void)
+{
+	return _getch();
 }
+#else
+int
+getch(void)
+{
+	char		   buf = 0;
+	struct termios old = {0};
+	fflush(stdout);
+	if (tcgetattr(0, &old) < 0)
+		perror("tcsetattr()");
+	old.c_lflag &= ~ICANON;
+	old.c_lflag &= ~ECHO;
+	old.c_cc[VMIN]	= 1;
+	old.c_cc[VTIME] = 0;
+	if (tcsetattr(0, TCSANOW, &old) < 0)
+		perror("tcsetattr ICANON");
+	if (read(0, &buf, 1) < 0)
+		perror("read()");
+	old.c_lflag |= ICANON;
+	old.c_lflag |= ECHO;
+	if (tcsetattr(0, TCSADRAIN, &old) < 0)
+		perror("tcsetattr ~ICANON");
+	return buf;
+}
+#endif
+
+}  // namespace zen
 
 int
 main(int argc, char** argv)
@@ -362,7 +373,7 @@ main(int argc, char** argv)
 		});
 
 		ZEN_INFO("press any key to tear instances down");
-		::getch();
+		zen::getch();
 
 		TimedBlock("Shutting down instances", [&] {
 			for (int i = 0; i < SpawnCount; ++i)
diff --git a/src/zenutil/jupiter/jupitersession.cpp b/src/zenutil/jupiter/jupitersession.cpp
index 1fd59acdf..ab2a2ea55 100644
--- a/src/zenutil/jupiter/jupitersession.cpp
+++ b/src/zenutil/jupiter/jupitersession.cpp
@@ -10,8 +10,6 @@
 #include <zencore/trace.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
-//#include <cpr/cpr.h>
-//#include <fmt/format.h>
 #include <json11.hpp>
 ZEN_THIRD_PARTY_INCLUDES_END