improving http post mechanism in remoteaccelerator

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>

xacc/accelerator/remote/RemoteAccelerator.cpp

@@ -62,7 +62,7 @@ const std::string RestClient::get(const std::string& remoteUrl,
 	// get the result as a string
 	std::stringstream z;
 	z << getResponse.get().extract_json().get();
-//	xacc::info("GET RESPONSE: " + z.str());
+	xacc::info("GET RESPONSE: " + z.str());
 	return z.str();
 }
 
@@ -72,7 +72,7 @@ void RemoteAccelerator::execute(std::shared_ptr<AcceleratorBuffer> buffer,
 	auto jsonPostStr = processInput(buffer, std::vector<std::shared_ptr<Function>> {
 			function });
 
-	auto responseStr = restClient->post(remoteUrl, postPath, jsonPostStr, headers);
+	auto responseStr = handleExceptionRestClientPost(remoteUrl, postPath, jsonPostStr, headers);
 
 	processResponse(buffer, responseStr);
 
@@ -85,7 +85,7 @@ std::vector<std::shared_ptr<AcceleratorBuffer>> RemoteAccelerator::execute(
 		const std::vector<std::shared_ptr<Function>> functions) {
 	auto jsonPostStr = processInput(buffer, functions);
 
-	auto responseStr = restClient->post(remoteUrl, postPath, jsonPostStr, headers);
+	auto responseStr = handleExceptionRestClientPost(remoteUrl, postPath, jsonPostStr, headers);
 
 	return processResponse(buffer, responseStr);
 }

xacc/accelerator/remote/RemoteAccelerator.hpp

@@ -105,6 +105,68 @@ protected:
 			std::shared_ptr<AcceleratorBuffer> buffer,
 			const std::string& response) = 0;
 
+	std::string handleExceptionRestClientPost(const std::string& _url, const std::string& path, const std::string& postStr,
+			std::map<std::string, std::string> headers) {
+		std::string postResponse;
+		int retries = 10;
+		std::exception ex;
+		bool succeeded = false;
+
+		// Execute HTTP Post
+		do {
+			try {
+				postResponse = restClient->post(_url, path, postStr, headers);
+				succeeded = true;
+				break;
+			} catch (std::exception& e) {
+				ex = e;
+				xacc::info("Remote Accelerator " + name() + " caught exception while calling restClient->post() "
+						"- " + std::string(e.what()));
+				retries--;
+				if (retries > 0) {
+					xacc::info("Retrying HTTP Get.");
+				}
+			}
+		} while (retries > 0);
+
+		if (!succeeded) {
+			xacc::error("Remote Accelerator " + name() + " failed HTTP Post for Job Response - " + std::string(ex.what()));
+		}
+
+		return postResponse;
+	}
+
+	std::string handleExceptionRestClientGet(const std::string& _url, const std::string& path) {
+		std::string getResponse;
+		int retries = 10;
+		std::exception ex;
+		bool succeeded = false;
+		// Execute HTTP Get
+		do {
+			try {
+				getResponse = restClient->get(_url, path);
+				succeeded = true;
+				break;
+			} catch (std::exception& e) {
+				ex = e;
+				xacc::info("Remote Accelerator " + name() + " caught exception while calling restClient->get() "
+						"- " + std::string(e.what()));
+				retries--;
+				if (retries > 0) {
+					xacc::info("Retrying HTTP Get.");
+				}
+			}
+		} while (retries > 0);
+
+		if (!succeeded) {
+			xacc::error("Remote Accelerator " + name() + " failed HTTP Get for Job Response - " + std::string(ex.what()));
+		}
+
+		return getResponse;
+	}
+
+
+
 };
 
 }