Commit 68a62dc2 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF53-add-environment-variable-to-control-log-level' into 'staging' 

Resolve "Add Environment variable to control log level"

Closes #53

See merge request !44
parents 953e49d8 dfdbde18

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

+7 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,10 @@ from opentelemetry.instrumentation.redis import RedisInstrumentor 




NAME = "Invoker-Service"

NAME = "Invoker-Service"





# Setting log level

log_level = os.getenv('LOG_LEVEL', 'INFO').upper()

numeric_level = getattr(logging, log_level, logging.INFO)



def configure_monitoring(app, config):

def configure_monitoring(app, config):





    resource = Resource(attributes={"service.name": NAME})

    resource = Resource(attributes={"service.name": NAME})
@@ -86,10 +90,10 @@ def configure_logging(app): 
    loggers = [app.logger, ]

    loggers = [app.logger, ]

    handlers = []

    handlers = []

    console_handler = logging.StreamHandler()

    console_handler = logging.StreamHandler()

    console_handler.setLevel(logging.DEBUG)

    console_handler.setLevel(numeric_level)

    console_handler.setFormatter(verbose_formatter())

    console_handler.setFormatter(verbose_formatter())

    file_handler = RotatingFileHandler(filename="invoker_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler = RotatingFileHandler(filename="invoker_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler.setLevel(logging.DEBUG)

    file_handler.setLevel(numeric_level)

    file_handler.setFormatter(verbose_formatter())

    file_handler.setFormatter(verbose_formatter())

    handlers.append(console_handler)

    handlers.append(console_handler)

    handlers.append(file_handler)

    handlers.append(file_handler)
@@ -99,7 +103,7 @@ def configure_logging(app): 
        for handler in handlers:

        for handler in handlers:

            l.addHandler(handler)

            l.addHandler(handler)

        l.propagate = False

        l.propagate = False

        l.setLevel(logging.DEBUG)

        l.setLevel(numeric_level)

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py

+7 −3
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ from opentelemetry.instrumentation.redis import RedisInstrumentor 




NAME = "Provider-Service"

NAME = "Provider-Service"





# Setting log level

log_level = os.getenv('LOG_LEVEL', 'INFO').upper()

numeric_level = getattr(logging, log_level, logging.INFO)



def configure_monitoring(app, config):

def configure_monitoring(app, config):





    resource = Resource(attributes={"service.name": NAME})

    resource = Resource(attributes={"service.name": NAME})
@@ -85,10 +89,10 @@ def configure_logging(app): 
    loggers = [app.logger, ]

    loggers = [app.logger, ]

    handlers = []

    handlers = []

    console_handler = logging.StreamHandler()

    console_handler = logging.StreamHandler()

    console_handler.setLevel(logging.DEBUG)

    console_handler.setLevel(numeric_level)

    console_handler.setFormatter(verbose_formatter())

    console_handler.setFormatter(verbose_formatter())

    file_handler = RotatingFileHandler(filename="provider_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler = RotatingFileHandler(filename="provider_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler.setLevel(logging.DEBUG)

    file_handler.setLevel(numeric_level)

    file_handler.setFormatter(verbose_formatter())

    file_handler.setFormatter(verbose_formatter())

    handlers.append(console_handler)

    handlers.append(console_handler)

    handlers.append(file_handler)

    handlers.append(file_handler)
@@ -97,7 +101,7 @@ def configure_logging(app): 
        for handler in handlers:

        for handler in handlers:

            l.addHandler(handler)

            l.addHandler(handler)

        l.propagate = False

        l.propagate = False

        l.setLevel(logging.DEBUG)

        l.setLevel(numeric_level)





def verbose_formatter():

def verbose_formatter():

    return logging.Formatter(

    return logging.Formatter(

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py

+7 −3
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ from opentelemetry.instrumentation.redis import RedisInstrumentor 




NAME = "Acl-Service"

NAME = "Acl-Service"





# Setting log level

log_level = os.getenv('LOG_LEVEL', 'INFO').upper()

numeric_level = getattr(logging, log_level, logging.INFO)



def configure_monitoring(app, config):

def configure_monitoring(app, config):





    resource = Resource(attributes={"service.name": NAME})

    resource = Resource(attributes={"service.name": NAME})
@@ -89,10 +93,10 @@ def configure_logging(app): 
    loggers = [app.logger, ]

    loggers = [app.logger, ]

    handlers = []

    handlers = []

    console_handler = logging.StreamHandler()

    console_handler = logging.StreamHandler()

    console_handler.setLevel(logging.DEBUG)

    console_handler.setLevel(numeric_level)

    console_handler.setFormatter(verbose_formatter())

    console_handler.setFormatter(verbose_formatter())

    file_handler = RotatingFileHandler(filename="acl_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler = RotatingFileHandler(filename="acl_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler.setLevel(logging.DEBUG)

    file_handler.setLevel(numeric_level)

    file_handler.setFormatter(verbose_formatter())

    file_handler.setFormatter(verbose_formatter())

    handlers.append(console_handler)

    handlers.append(console_handler)

    handlers.append(file_handler)

    handlers.append(file_handler)
@@ -101,7 +105,7 @@ def configure_logging(app): 
        for handler in handlers:

        for handler in handlers:

            l.addHandler(handler)

            l.addHandler(handler)

        l.propagate = False

        l.propagate = False

        l.setLevel(logging.DEBUG)

        l.setLevel(numeric_level)





def verbose_formatter():

def verbose_formatter():

    return logging.Formatter(

    return logging.Formatter(

services/TS29222_CAPIF_Auditing_API/logs/app.py

+7 −3
Original line number Original line Diff line number Diff line
@@ -18,6 +18,10 @@ from opentelemetry.sdk.trace.export import BatchSpanProcessor 




NAME = "Logs-Service"

NAME = "Logs-Service"





# Setting log level

log_level = os.getenv('LOG_LEVEL', 'INFO').upper()

numeric_level = getattr(logging, log_level, logging.INFO)



def configure_monitoring(app, config):

def configure_monitoring(app, config):





    resource = Resource(attributes={"service.name": NAME})

    resource = Resource(attributes={"service.name": NAME})
@@ -79,10 +83,10 @@ def configure_logging(app): 
    loggers = [app.logger, ]

    loggers = [app.logger, ]

    handlers = []

    handlers = []

    console_handler = logging.StreamHandler()

    console_handler = logging.StreamHandler()

    console_handler.setLevel(logging.DEBUG)

    console_handler.setLevel(numeric_level)

    console_handler.setFormatter(verbose_formatter())

    console_handler.setFormatter(verbose_formatter())

    file_handler = RotatingFileHandler(filename="service_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler = RotatingFileHandler(filename="service_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler.setLevel(logging.DEBUG)

    file_handler.setLevel(numeric_level)

    file_handler.setFormatter(verbose_formatter())

    file_handler.setFormatter(verbose_formatter())

    handlers.append(console_handler)

    handlers.append(console_handler)

    handlers.append(file_handler)

    handlers.append(file_handler)
@@ -91,7 +95,7 @@ def configure_logging(app): 
        for handler in handlers:

        for handler in handlers:

            l.addHandler(handler)

            l.addHandler(handler)

        l.propagate = False

        l.propagate = False

        l.setLevel(logging.DEBUG)

        l.setLevel(numeric_level)





def verbose_formatter():

def verbose_formatter():

    return logging.Formatter(

    return logging.Formatter(

services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py

+6 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,9 @@ from opentelemetry.instrumentation.redis import RedisInstrumentor 




NAME = "Discover-Service"

NAME = "Discover-Service"





# Setting log level

log_level = os.getenv('LOG_LEVEL', 'INFO').upper()

numeric_level = getattr(logging, log_level, logging.INFO)





def configure_monitoring(app, config):

def configure_monitoring(app, config):
@@ -86,10 +89,10 @@ def configure_logging(app): 
    loggers = [app.logger, ]

    loggers = [app.logger, ]

    handlers = []

    handlers = []

    console_handler = logging.StreamHandler()

    console_handler = logging.StreamHandler()

    console_handler.setLevel(logging.DEBUG)

    console_handler.setLevel(numeric_level)

    console_handler.setFormatter(verbose_formatter())

    console_handler.setFormatter(verbose_formatter())

    file_handler = RotatingFileHandler(filename="discover_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler = RotatingFileHandler(filename="discover_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)

    file_handler.setLevel(logging.DEBUG)

    file_handler.setLevel(numeric_level)

    file_handler.setFormatter(verbose_formatter())

    file_handler.setFormatter(verbose_formatter())

    handlers.append(console_handler)

    handlers.append(console_handler)

    handlers.append(file_handler)

    handlers.append(file_handler)
@@ -98,7 +101,7 @@ def configure_logging(app): 
        for handler in handlers:

        for handler in handlers:

            l.addHandler(handler)

            l.addHandler(handler)

        l.propagate = False

        l.propagate = False

        l.setLevel(logging.DEBUG)

        l.setLevel(numeric_level)





def verbose_formatter():

def verbose_formatter():

    return logging.Formatter(

    return logging.Formatter(