Let the arangosh reconnect automatically. (arangodb#10002)

neunhoef · jsteemann · commit b5aca277256e · 2019-09-12T18:20:06.000+02:00
diff --git a/arangosh/Shell/V8ClientConnection.cpp b/arangosh/Shell/V8ClientConnection.cpp
@@ -163,6 +163,18 @@ std::shared_ptr<fuerte::Connection> V8ClientConnection::createConnection() {
   return nullptr;
 }
 
+std::shared_ptr<fuerte::Connection> V8ClientConnection::acquireConnection() {
+  std::lock_guard<std::recursive_mutex> guard(_lock);
+  
+  _lastErrorMessage = "";
+  _lastHttpReturnCode = 0;
+  
+  if (!_connection || _connection->state() == fuerte::Connection::State::Failed) {
+    return createConnection();
+  }
+  return _connection;
+}
+
 void V8ClientConnection::setInterrupted(bool interrupted) {
   std::lock_guard<std::recursive_mutex> guard(_lock);
   if (interrupted && _connection != nullptr) {
@@ -1499,14 +1511,7 @@ v8::Local<v8::Value> V8ClientConnection::requestData(
   }
   req->timeout(std::chrono::duration_cast<std::chrono::milliseconds>(_requestTimeout));
 
-  std::shared_ptr<fuerte::Connection> connection;
-  {
-    std::lock_guard<std::recursive_mutex> guard(_lock);
-    _lastErrorMessage = "";
-    _lastHttpReturnCode = 0;
-    connection = _connection;
-  }
-  
+  std::shared_ptr<fuerte::Connection> connection = acquireConnection();
   if (!connection || connection->state() == fuerte::Connection::State::Failed) {
     TRI_V8_SET_EXCEPTION_MESSAGE(TRI_ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT,
                                  "not connected");
@@ -1527,8 +1532,6 @@ v8::Local<v8::Value> V8ClientConnection::requestDataRaw(
     v8::Isolate* isolate, fuerte::RestVerb method, arangodb::velocypack::StringRef const& location,
     v8::Local<v8::Value> const& body,
     std::unordered_map<std::string, std::string> const& headerFields) {
-  _lastErrorMessage = "";
-  _lastHttpReturnCode = 0;
 
   auto req = std::make_unique<fuerte::Request>();
   req->header.restVerb = method;
@@ -1565,13 +1568,7 @@ v8::Local<v8::Value> V8ClientConnection::requestDataRaw(
   }
   req->timeout(std::chrono::duration_cast<std::chrono::milliseconds>(_requestTimeout));
 
-  std::shared_ptr<fuerte::Connection> connection;
-  {
-    std::lock_guard<std::recursive_mutex> guard(_lock);
-    _lastErrorMessage = "";
-    _lastHttpReturnCode = 0;
-    connection = _connection;
-  }
+  std::shared_ptr<fuerte::Connection> connection = acquireConnection();
   
   if (!connection || connection->state() == fuerte::Connection::State::Failed) {
     TRI_V8_SET_EXCEPTION_MESSAGE(TRI_ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT,
diff --git a/arangosh/Shell/V8ClientConnection.h b/arangosh/Shell/V8ClientConnection.h
@@ -118,6 +118,7 @@ class V8ClientConnection {
 
  private:
   std::shared_ptr<fuerte::Connection> createConnection();
+  std::shared_ptr<fuerte::Connection> acquireConnection();
 
   v8::Local<v8::Value> requestData(v8::Isolate* isolate, fuerte::RestVerb verb,
                                    arangodb::velocypack::StringRef const& location,
