reset on exceed max connection.

XX-net · Jul 10, 2023 · 99e09fe · 99e09fe
1 parent 3aac4a5
commit 99e09fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/code/default/version.txt b/code/default/version.txt
@@ -1 +1 @@
-5.3.0
+5.3.1
diff --git a/code/default/x_tunnel/local/base_container.py b/code/default/x_tunnel/local/base_container.py
@@ -531,6 +531,8 @@ def cmd_processor(self):
                 self.xlog.debug("Conn session:%s conn:%d Peer Close:%s", self.session.session_id, self.conn_id, dat)
                 if self.is_client:
                     self.transfer_peer_close("finish")
+                    if b"exceed the max connection" in dat:
+                        self.session.reset()
                 self.stop("peer close")
 
             elif cmd_id == 0:  # Create connect

diff --git a/code/default/x_tunnel/local/proxy_session.py b/code/default/x_tunnel/local/proxy_session.py
@@ -709,10 +709,8 @@ def normal_round_trip_worker(self, work_id):
                             # session not exist
                             if self.session_id == request_session_id:
                                 xlog.warn("server session_id:%s not exist, reset session.", request_session_id)
-                                self.reset()
-                                return
-                            else:
-                                return
+                            self.reset()
+                            return
                         else:
                             xlog.error("unknown error code:%d, message:%s", error_code, message)
                             time.sleep(sleep_time)