Merge 5cb5cd1 into 1add881

wolf4ood · Oct 19, 2023 · b86da23 · b86da23
2 parents 1add881 + 5cb5cd1
commit b86da23
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/gremlin-client/src/error.rs b/gremlin-client/src/error.rs
@@ -47,10 +47,20 @@ impl From<mobc::Error<GremlinError>> for GremlinError {
     fn from(e: mobc::Error<GremlinError>) -> GremlinError {
         match e {
             mobc::Error::Inner(e) => e,
-            mobc::Error::BadConn => {
-                GremlinError::Generic(String::from("Async pool bad connection"))
-            }
+            mobc::Error::BadConn => GremlinError::Generic(String::from("Async pool bad connection")),
             mobc::Error::Timeout => GremlinError::Generic(String::from("Async pool timeout")),
         }
     }
 }
+
+#[cfg(not(feature = "async_gremlin"))]
+impl From<tungstenite::error::Error> for GremlinError {
+    fn from(e: tungstenite::error::Error) -> GremlinError {
+        let error = match e {
+            tungstenite::error::Error::AlreadyClosed => tungstenite::error::Error::AlreadyClosed,
+            tungstenite::error::Error::ConnectionClosed => tungstenite::error::Error::ConnectionClosed,
+            _ => return GremlinError::Generic(format!("Error from ws {}", e)),
+        };
+        GremlinError::WebSocket(error)
+    }
+}