Revize 445886fb

Re #8884 - Improved exceptions in repositories

src/dao/certificate_repository.py

@@ -88 +88 @@
                         values = [last_id, usage_id]
                         self.cursor.execute(sql, values)
                         self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError as e:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            # TODO will be improved in #8884
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
             Logger.error(str(e))
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+            raise DatabaseException(e)
 
         return last_id
 
@@ -159 +143 @@
                                                    certificate_row[11],     # revocation date
                                                    certificate_row[12])     # revocation reason
 
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificate
 
@@ -233 +202 @@
                                                 certificate_row[10],     # email address
                                                 certificate_row[11],     # revocation date
                                                 certificate_row[12]))    # revocation reason
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificates
 
@@ -324 +279 @@
                                                 certificate_row[10],  # email address
                                                 certificate_row[11],  # revocation date
                                                 certificate_row[12]))  # revocation reason
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificates
 
@@ -411 +352 @@
                     values = [certificate_id, usage_id]
                     self.cursor.execute(sql, values)
                     self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return check_updated
 
@@ -451 +378 @@
                       certificate_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return self.cursor.rowcount > 0
 
@@ -503 +416 @@
                       certificate_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return self.cursor.rowcount > 0
 
@@ -545 +444 @@
             values = [certificate_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return self.cursor.rowcount > 0
 
@@ -616 +501 @@
                                                 certificate_row[10],     # email address
                                                 certificate_row[11],     # revocation date
                                                 certificate_row[12]))    # revocation reason
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificates
 
@@ -688 +559 @@
                                                 certificate_row[10],     # email address
                                                 certificate_row[11],     # revocation date
                                                 certificate_row[12]))    # revocation reason
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificates
 
@@ -784 +641 @@
                                                 certificate_row[10],  # email address
                                                 certificate_row[11],  # revocation date
                                                 certificate_row[12]))  # revocation reason
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return certificates
 
@@ -827 +670 @@
 
             all_certs = []
             dfs(self.get_all_issued_by, subtree_root, all_certs)
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return all_certs
 
@@ -866 +695 @@
                 if result[0] == TAB_CERTIFICATES:
                     return result[1] + 1  # current last id + 1
             # if certificates table is not present in the query results, return 1
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return 1

src/dao/private_key_repository.py

@@ -49 +49 @@
             self.cursor.execute(sql, values)
             last_id = self.cursor.lastrowid
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return last_id
 
@@ -92 +78 @@
             private_key: PrivateKey = PrivateKey(private_key_row[0],
                                                  private_key_row[1],
                                                  private_key_row[2])
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return private_key
 
@@ -171 +143 @@
                 private_keys.append(PrivateKey(private_key_row[0],
                                                private_key_row[1],
                                                private_key_row[2]))
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return private_keys
 
@@ -212 +170 @@
                       private_key_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return self.cursor.rowcount > 0
 
@@ -248 +192 @@
             values = [private_key_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
-        except IntegrityError:
-            Logger.error(INTEGRITY_ERROR_MSG)
-            raise DatabaseException(INTEGRITY_ERROR_MSG)
-        except ProgrammingError:
-            Logger.error(PROGRAMMING_ERROR_MSG)
-            raise DatabaseException(PROGRAMMING_ERROR_MSG)
-        except OperationalError:
-            Logger.error(OPERATIONAL_ERROR_MSG)
-            raise DatabaseException(OPERATIONAL_ERROR_MSG)
-        except NotSupportedError:
-            Logger.error(NOT_SUPPORTED_ERROR_MSG)
-            raise DatabaseException(NOT_SUPPORTED_ERROR_MSG)
-        except DatabaseError:
-            Logger.error(DATABASE_ERROR_MSG)
-            raise DatabaseException(DATABASE_ERROR_MSG)
-        except Error:
-            Logger.error(ERROR_MSG)
-            raise DatabaseException(ERROR_MSG)
+
+        except (IntegrityError, OperationalError, ProgrammingError, NotSupportedError, DatabaseError, Error) as e:
+            Logger.error(str(e))
+            raise DatabaseException(e)
 
         return self.cursor.rowcount > 0