From 71b060110dbba75fe6cc54ccf440c2da780cb39b Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Thu, 9 Dec 2021 22:28:52 +0100 Subject: [PATCH] Modified 'insertStorage()' method. Signed-off-by: Cristiano Urban --- transfer_service/db_connector.py | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index e8bbe8a..b6458e8 100644 --- a/transfer_service/db_connector.py +++ b/transfer_service/db_connector.py @@ -1213,11 +1213,11 @@ class DbConnector(object): else: try: cursor.execute(""" - SELECT storage_id + SELECT DISTINCT storage_id FROM storage + JOIN location ON storage_id = storage_dest_id WHERE storage_type = 'local' - AND base_path = '/home' - AND hostname = 'localhost'; + AND location_type = 'async'; """) storageDestId = cursor.fetchall()[0]["storage_id"] except Exception: @@ -1226,24 +1226,24 @@ class DbConnector(object): raise else: locationType = "async" - try: - cursor.execute(""" - INSERT INTO location(location_type, - storage_src_id, - storage_dest_id) - VALUES (%s, %s, %s); - """, - (locationType, - storageSrcId, - storageDestId,)) - conn.commit() - cursor.close() - except Exception: - if not conn.closed: - conn.rollback() - raise - else: - return True + try: + cursor.execute(""" + INSERT INTO location(location_type, + storage_src_id, + storage_dest_id) + VALUES (%s, %s, %s); + """, + (locationType, + storageSrcId, + storageDestId,)) + conn.commit() + cursor.close() + except Exception: + if not conn.closed: + conn.rollback() + raise + else: + return True finally: self.connPool.putconn(conn, close = False) else: -- GitLab