oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into bugfix/fix_pipeline_bug

Browse Source
This commit is contained in:
Marek Wolan
2024-06-13 12:53:33 +01:00
parent 0dce49484d ae2bbd3e00
commit d22117a614
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/primaite/simulator/system/applications/database_client.py
View File

@@ -270,9 +270,16 @@ class DatabaseClient(Application):
Calls disconnect on all client connections to ensure that both client and server connections are killed. Calls disconnect on all client connections to ensure that both client and server connections are killed.
""" """
while self.client_connections.values(): while self.client_connections:
client_connection = self.client_connections[next(iter(self.client_connections.keys()))] conn_key = next(iter(self.client_connections.keys()))
client_connection.disconnect() conn_obj: DatabaseClientConnection = self.client_connections[conn_key]
conn_obj.disconnect()
if conn_obj.is_active or conn_key in self.client_connections:
self.sys_log.error(
"Attempted to uninstall database client but could not drop active connections. "
"Forcing uninstall anyway."
)
self.client_connections.pop(conn_key, None)
super().uninstall() super().uninstall()
def get_new_connection(self) -> Optional[DatabaseClientConnection]: def get_new_connection(self) -> Optional[DatabaseClientConnection]: