Commit 8579a96c authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'OCF90-fix-services-redis' into 'staging' 

Draft: Resolve "fix-services-redis"

Closes #90

See merge request !81
parents bb7d2b5c 4197e898

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

+10 −13
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ from logging.handlers import RotatingFileHandler 
import os

from fluent import sender

from flask_executor import Executor

from flask_apscheduler import APScheduler

from datetime import datetime

from opentelemetry.instrumentation.flask import FlaskInstrumentor

from opentelemetry import trace

from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
@@ -137,16 +139,11 @@ if monitoring_value == "true": 


executor = Executor(app.app)

subscriber = Subscriber()



first = True



@app.app.before_request

def create_listener_message():

    global first

    if first:

        executor.submit(subscriber.listen)

        first = False



# @app.app.before_first_request

# def create_listener_message():

#     executor.submit(subscriber.listen)
 
 No newline at end of file
 
scheduler = APScheduler()

scheduler.init_app(app.app)

scheduler.start()



@scheduler.task('date', id='listener', next_run_time=datetime.now())

def up_listener():

    with scheduler.app.app_context():

        executor.submit(subscriber.listen())

services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ fluent-logger == 0.10.0 
opentelemetry-api == 1.19.0

opentelemetry-sdk == 1.19.0

flask_executor == 1.0.0

Flask-APScheduler == 1.13.1

werkzeug == 3.0.4

gunicorn == 22.0.0

packaging == 24.0
 
 No newline at end of file

services/TS29222_CAPIF_Events_API/capif_events/app.py

+9 −15
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ from multiprocessing import Process 
from threading import Thread

from flask_executor import Executor

from flask_apscheduler import APScheduler

from datetime import datetime

from logging.handlers import RotatingFileHandler

from config import Config

import os
@@ -144,18 +145,11 @@ if monitoring_value == "true": 
config = Config()

executor = Executor(app.app)

subscriber = Subscriber()

# scheduler = APScheduler()

# scheduler.init_app(app.app)



# @app.app.before_first_request

# def create_listener_message():

#     executor.submit(subscriber.listen)



first = True



@app.app.before_request

def create_listener_message():

    global first

    if first:

        executor.submit(subscriber.listen)

        first = False
 
scheduler = APScheduler()

scheduler.init_app(app.app)

scheduler.start()



@scheduler.task('date', id='listener', next_run_time=datetime.now())

def up_listener():

    with scheduler.app.app_context():

        executor.submit(subscriber.listen())

services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py

+9 −7
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ import os 
from fluent import sender

from flask_executor import Executor

from opentelemetry.instrumentation.flask import FlaskInstrumentor

from flask_apscheduler import APScheduler

from datetime import datetime

from opentelemetry import trace

from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter

from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
@@ -134,12 +136,12 @@ if monitoring_value == "true": 


executor = Executor(app.app)

subscriber = Subscriber()

scheduler = APScheduler()

scheduler.init_app(app.app)

scheduler.start()



first = True



@app.app.before_request

@scheduler.task('date', id='listener', next_run_time=datetime.now())

def up_listener():

    global first

    if first:

        executor.submit(subscriber.listen)

        first = False
 
    with scheduler.app.app_context():

        executor.submit(subscriber.listen())

services/TS29222_CAPIF_Publish_Service_API/requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ fluent-logger == 0.10.0 
opentelemetry-api == 1.17.0

opentelemetry-sdk == 1.17.0

flask_executor == 1.0.0

Flask-APScheduler == 1.13.1

werkzeug == 3.0.4

gunicorn == 22.0.0

packaging == 24.0