Revize ca436714

Re #8570 - Logger configuration
- implemented dictionary to string in utils
- implemented log functions with parameter message only (name of file, name of class and name of function
are getting automaticaly)

app.py

@@ -9 +9 @@
 from src.controllers.certificates_controller import CertController
 from src.controllers.crl_ocsp_controller import CrlOcspController
 from src.services.cryptography import CryptographyService, CryptographyException
+from src.utils.logger import Logger
 
 app = Flask(__name__)
 
@@ -92 +93 @@
     :return: boolean flag indicating whether initialization was successful or not
     """
 
+    configuration.configure_logging()
+
     modules = [configuration.configure_env_variable, ConnectionProvider]
     injector = Injector(modules)
     FlaskInjector(app=application, modules=modules)
 
-    configuration.configure_logging()
-
     # There's a little dependency on the CryptoService, which is not a pretty thing from
     # architectural point of view. However it is only a minimal piece of code and
     # it makes sense to do it in this way instead of trying to run openssl via subprocess here
@@ -105 +106 @@
     try:
         # if version string is returned, OpenSSL is present on the system
         print(f"Using {cryptography_service.get_openssl_version()}")
+        Logger.info(f"Using {cryptography_service.get_openssl_version()}")
         # TODO log the version instead of prining it out
         return True
     except CryptographyException:
         # If getting the version string throws an exception the OpenSSL is not available
         print("OpenSSL was not located on the system. Application will now exit.")
+        Logger.error(f"OpenSSL was not located on the system. Application will now exit.")
         # TODO add logging here
         return False
 
@@ -119 +122 @@
     if not initialize_app(app):
         # TODO log this
         print("Failed to initialize app, aborting...")
+        Logger.error(f"Failed to initialize app, aborting...")
         exit(-1)
 
 if __name__ == '__main__':

src/constants.py

@@ -62 +62 @@
 CERTIFICATE_REVOCATION_REASONS = {"unspecified", "keyCompromise",
                                   "CACompromise", "affiliationChanged",
                                   "superseded", "cessationOfOperation",
-<<<<<<< HEAD
-                                  "certificateHold", "removeFromCRL",
-                                  "privilegeWithdrawn", "aACompromise"}
-
-LAYER_REPOSITORY = "Repository";
-=======
                                   "certificateHold", "removeFromCRL"}
 
 
@@ -94 +88 @@
 organizationalUnitName = optional
 
 """
-
->>>>>>> master

src/utils/logger.py

@@ -8 +8 @@
     @staticmethod
     def get_names():
         stack = inspect.stack()
-        file_name = inspect.getfile(stack[2][0].f_locals["self"].__class__)
-        class_name = stack[2][0].f_locals["self"].__class__.__name__
+
+        file_name = inspect.getmodule(inspect.stack()[2][0]).__file__
+        class_name = ""
+        if "self" in stack[2][0].f_locals:
+            class_name = stack[2][0].f_locals["self"].__class__.__name__ + "."
         function_name = stack[2][0].f_code.co_name
 
         return file_name, class_name, function_name
@@ -17 +20 @@
     @staticmethod
     def debug(message: str):
         names = Logger.get_names()
-        logging.debug(f'{Path(names[0]).name}[{names[1]}.{names[2]}()]: {message}')
+        logging.debug(f'{Path(names[0]).name}[{names[1]}{names[2]}()]: {message}')
 
     @staticmethod
     def info(message: str):
         names = Logger.get_names()
-        logging.info(f'{Path(names[0]).name}[{names[1]}.{names[2]}()]: {message}')
+        logging.info(f'{Path(names[0]).name}[{names[1]}{names[2]}()]: {message}')
 
     @staticmethod
     def warning(message: str):
         names = Logger.get_names()
-        logging.warning(f'{Path(names[0]).name}[{names[1]}.{names[2]}()]: {message}')
+        logging.warning(f'{Path(names[0]).name}[{names[1]}{names[2]}()]: {message}')
 
     @staticmethod
     def error(message: str):

src/utils/util.py

@@ -1 +1 @@
 import datetime
 
 import six
-import typing
 
 
 def _deserialize(data, klass):
@@ -139 +138 @@
     """
     return {k: _deserialize(v, boxed_type)
             for k, v in six.iteritems(data)}
+
+
+def dict_to_string(data):
+    data_str = ""
+    for key, value in data.items():
+        data_str += f"\t\t{key}"
+
+        if type(value) is dict:
+            data_str += " --\n"
+            for subkey, subvalue in value.items():
+                data_str += f"\t\t\t{subkey} : {subvalue}\n"
+        else:
+            data_str += f" : {value}\n"
+
+    return data_str