Merge pull request #58 from salesforce/catch-connection-errors-early

Author: twarit-waikar

p4-fusion/commands/test_result.cc

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 Salesforce, Inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+#include "test_result.h"
+
+void TestResult::OutputStat(StrDict* varList)
+{
+}
+
+void TestResult::OutputText(const char* data, int length)
+{
+}
+
+void TestResult::OutputBinary(const char* data, int length)
+{
+}

p4-fusion/commands/test_result.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2022 Salesforce, Inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+#pragma once
+
+#include "common.h"
+#include "result.h"
+
+class TestResult : public Result
+{
+public:
+	void OutputStat(StrDict* varList) override;
+	void OutputText(const char* data, int length) override;
+	void OutputBinary(const char* data, int length) override;
+};

p4-fusion/main.cc

@@ -82,6 +82,18 @@ int Main(int argc, char** argv)
 
 	P4API::P4PORT = Arguments::GetSingleton()->GetPort();
 	P4API::P4USER = Arguments::GetSingleton()->GetUsername();
+
+	const Error& serviceConnectionResult = P4API().TestConnection(5).GetError();
+	bool serverAvailable = serviceConnectionResult.IsError() == 0;
+	if (serverAvailable)
+	{
+		SUCCESS("Perforce server is available");
+	}
+	else
+	{
+		ERR("Error occurred while connecting to " << P4API::P4PORT);
+		return 1;
+	}
 	P4API::P4CLIENT = Arguments::GetSingleton()->GetClient();
 	P4API::ClientSpec = P4API().Client().GetClientSpec();
 
@@ -358,15 +370,17 @@ void SignalHandler(sig_atomic_t s)
 
 int main(int argc, char** argv)
 {
+	int exitCode = 0;
+
 	try
 	{
-		Main(argc, argv);
+		exitCode = Main(argc, argv);
 	}
 	catch (const std::exception& e)
 	{
 		ERR("Exception occurred: " << typeid(e).name() << ": " << e.what());
 		return 1;
 	}
 
-	return 0;
+	return exitCode;
 }

p4-fusion/p4_api.cc

@@ -227,6 +227,11 @@ ClientResult P4API::Client()
 	return Run<ClientResult>("client", { "-o" });
 }
 
+TestResult P4API::TestConnection(const int retries)
+{
+	return RunEx<TestResult>("changes", { "-m", "1", "//..." }, retries);
+}
+
 ChangesResult P4API::ShortChanges(const std::string& path)
 {
 	return Run<ChangesResult>("changes", {

p4-fusion/p4_api.h

@@ -21,6 +21,7 @@
 #include "commands/users_result.h"
 #include "commands/info_result.h"
 #include "commands/client_result.h"
+#include "commands/test_result.h"
 
 class P4API
 {
@@ -35,6 +36,8 @@ class P4API
 
 	template <class T>
 	T Run(const char* command, const std::vector<std::string>& stringArguments);
+	template <class T>
+	T RunEx(const char* command, const std::vector<std::string>& stringArguments, const int commandRetries);
 
 public:
 	static std::string P4PORT;
@@ -63,6 +66,7 @@ class P4API
 
 	void AddClientSpecView(const std::vector<std::string>& viewStrings);
 
+	TestResult TestConnection(const int retries);
 	ChangesResult ShortChanges(const std::string& path);
 	ChangesResult Changes(const std::string& path);
 	ChangesResult Changes(const std::string& path, const std::string& from, int32_t maxCount);
@@ -84,7 +88,7 @@ class P4API
 };
 
 template <class T>
-inline T P4API::Run(const char* command, const std::vector<std::string>& stringArguments)
+inline T P4API::RunEx(const char* command, const std::vector<std::string>& stringArguments, const int commandRetries)
 {
 	std::string argsString;
 	for (const std::string& stringArg : stringArguments)
@@ -103,7 +107,7 @@ inline T P4API::Run(const char* command, const std::vector<std::string>& stringA
 	m_ClientAPI.SetArgv(argsCharArray.size(), argsCharArray.data());
 	m_ClientAPI.Run(command, &clientUser);
 
-	int retries = CommandRetries;
+	int retries = commandRetries;
 	while (m_ClientAPI.Dropped() || clientUser.GetError().IsError())
 	{
 		if (retries == 0)
@@ -167,3 +171,9 @@ inline T P4API::Run(const char* command, const std::vector<std::string>& stringA
 
 	return clientUser;
 }
+
+template <class T>
+inline T P4API::Run(const char* command, const std::vector<std::string>& stringArguments)
+{
+	return RunEx<T>(command, stringArguments, CommandRetries);
+}