draft implementation

gremlin-go/driver/client_test.go

@@ -378,30 +378,28 @@ func TestClientAgainstSocketServer(t *testing.T) {
 	 * purposes. See https://issues.apache.org/jira/browse/TINKERPOP-2845.
 	 * This test should be uncommented with the resolution of TINKERPOP-2845
 	 */
-	/*
-		t.Run("Should try create new connection if closed by server", func(t *testing.T) {
-			skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
-			client, err := NewClient(testSocketServerUrl)
-			defer client.Close()
-			assert.Nil(t, err)
-			assert.NotNil(t, client)
-			resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
-				SetRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).Create())
-			assert.Nil(t, err)
-			assert.NotNil(t, resultSet)
-
-			result, ok, err := resultSet.One()
-
-			assert.EqualError(t, err, "websocket: close 1005 (no status)")
-
-			resultSet, err = client.SubmitWithOptions("1", new(RequestOptionsBuilder).
-				SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
-			assert.Nil(t, err)
-			assert.NotNil(t, resultSet)
-			result, ok, err = resultSet.One()
-			assert.Nil(t, err)
-			assert.True(t, ok)
-			assert.NotNil(t, result)
-		})
-	*/
+	t.Run("Should try create new connection if closed by server", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testSocketServerUrl)
+		defer client.Close()
+		assert.Nil(t, err)
+		assert.NotNil(t, client)
+		resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+
+		result, ok, err := resultSet.One()
+
+		assert.EqualError(t, err, "websocket: close 1005 (no status)")
+
+		resultSet, err = client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+		result, ok, err = resultSet.One()
+		assert.Nil(t, err)
+		assert.True(t, ok)
+		assert.NotNil(t, result)
+	})
 }

gremlin-go/driver/connection.go

@@ -39,6 +39,7 @@ type connection struct {
 	protocol   protocol
 	results    *synchronizedMap
 	state      connectionState
+	syncLock   sync.Mutex
 }
 
 type connectionSettings struct {
@@ -54,6 +55,13 @@ type connectionSettings struct {
 }
 
 func (connection *connection) errorCallback() {
+	connection.syncLock.Lock()
+	defer connection.syncLock.Unlock()
+
+	if connection.state == closed || connection.state == closedDueToError {
+		return
+	}
+
 	connection.logHandler.log(Error, errorCallback)
 	connection.state = closedDueToError
 
@@ -65,6 +73,9 @@ func (connection *connection) errorCallback() {
 }
 
 func (connection *connection) close() error {
+	connection.syncLock.Lock()
+	defer connection.syncLock.Unlock()
+
 	if connection.state != established {
 		return newError(err0101ConnectionCloseError)
 	}
@@ -106,6 +117,7 @@ func createConnection(url string, logHandler *logHandler, connSettings *connecti
 		nil,
 		&synchronizedMap{map[string]ResultSet{}, sync.Mutex{}},
 		initialized,
+		sync.Mutex{},
 	}
 	logHandler.log(Info, connectConnection)
 	protocol, err := newGremlinServerWSProtocol(logHandler, Gorilla, url, connSettings, conn.results, conn.errorCallback)