reconnect() method

Author: nakagami

firebirdsql/__init__.py

@@ -96,7 +96,7 @@ def __cmp__(self, other):
 
 def connect(*args, **kwargs):
     conn = Connection(*args, **kwargs)
-    conn._initialize_socket()
+    conn._initialize()
     return conn
 
 

firebirdsql/aio/__init__.py

@@ -4,5 +4,5 @@
 
 async def connect(**kwargs):
     conn = AsyncConnection(**kwargs)
-    await conn._initialize_socket()
+    await conn._initialize()
     return conn

firebirdsql/aio/fbcore.py

@@ -884,7 +884,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.last_usage = self.loop.time()
 
-    async def _initialize_socket(self):
+    async def _initialize(self):
+        self.last_event_id = 0
+        self._autocommit = False
+        self._transaction = None
+        self._cursors = {}
+
         self.sock = AsyncSocketStream(self.hostname, self.port, self.loop, self.timeout, self.cloexec)
 
         self._op_connect(self.auth_plugin_name, self.wire_crypt)
@@ -897,7 +902,7 @@ async def _initialize_socket(self):
         self._op_attach(self.timezone)
         (h, oid, buf) = await self._async_op_response()
         self.db_handle = h
-        DEBUG_OUTPUT("AsyncConnection::_initialize_socket()", self.db_handle)
+        DEBUG_OUTPUT("AsyncConnection::_initialize()", self.db_handle)
 
     async def __aenter__(self):
         return self
@@ -910,6 +915,10 @@ async def __aexit__(self, exc, value, traceback):
             await self.commit()
         await self.close()
 
+    async def reconnect(self):
+        self.close()
+        await self._initialize()
+
     async def set_autocommit(self, is_autocommit):
         if self._autocommit != is_autocommit and self._transaction is not None:
             await self.rollback()

firebirdsql/aio/pool.py

@@ -166,7 +166,7 @@ async def _fill_free_pool(self, override_min):
             self._acquiring += 1
             try:
                 conn = AsyncConnection(loop=self._loop, **self._conn_kwargs)
-                await conn._initialize_socket()
+                await conn._initialize()
                 # raise exception if pool is closing
                 self._free.append(conn)
                 self._cond.notify()
@@ -179,7 +179,7 @@ async def _fill_free_pool(self, override_min):
             self._acquiring += 1
             try:
                 conn = AsyncConnection(loop=self._loop, **self._conn_kwargs)
-                await conn._initialize_socket()
+                await conn._initialize()
                 # raise exception if pool is closing
                 self._free.append(conn)
                 self._cond.notify()

firebirdsql/fbcore.py

@@ -974,13 +974,14 @@ def __init__(
             self.isolation_level = int(isolation_level)
         self.use_unicode = use_unicode
         self.timezone = timezone
-        self.last_event_id = 0
 
+
+    def _initialize(self):
+        self.last_event_id = 0
         self._autocommit = False
         self._transaction = None
         self._cursors = {}
 
-    def _initialize_socket(self):
         self.sock = SocketStream(self.hostname, self.port, self.timeout, self.cloexec)
 
         self._op_connect(self.auth_plugin_name, self.wire_crypt)
@@ -998,7 +999,7 @@ def _initialize_socket(self):
             self._op_attach(self.timezone)
         (h, oid, buf) = self._op_response()
         self.db_handle = h
-        DEBUG_OUTPUT("Connection::_initialize_socket()", self.db_handle)
+        DEBUG_OUTPUT("Connection::_initialize()", self.db_handle)
 
     def __enter__(self):
         return self
@@ -1011,6 +1012,10 @@ def __exit__(self, exc, value, traceback):
             self.commit()
         self.close()
 
+    def reconnect(self):
+        self.close()
+        self._initalize()
+
     def set_isolation_level(self, isolation_level):
         self.isolation_level = int(isolation_level)
 

firebirdsql/services.py

@@ -374,5 +374,5 @@ def getStatistics(
 def connect(**kwargs):
     kwargs['is_services'] = True
     services = Services(**kwargs)
-    services._initialize_socket()
+    services._initialize()
     return services