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

Draft: Resolve "fix-services-redis"

Closes #90

See merge request !81

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

services/TS29222_CAPIF_Security_API/capif_security/app.py

@@ -6,6 +6,8 @@ import encoder
 from flask_jwt_extended import JWTManager
 from config import Config
 from core.consumer_messager import Subscriber
+from flask_apscheduler import APScheduler
+from datetime import datetime
 from logging.handlers import RotatingFileHandler
 import os
 from fluent import sender
@@ -134,12 +136,11 @@ if monitoring_value == "true":
     configure_monitoring(app.app, config.get_config())
 
 executor = Executor(app.app)
+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_Security_API/requirements.txt

@@ -18,6 +18,7 @@ fluent == 0.10.0
 fluent-logger == 0.10.0
 opentelemetry-api == 1.19.0
 opentelemetry-sdk == 1.19.0
+Flask-APScheduler == 1.13.1
 flask_executor == 1.0.0
 werkzeug == 3.0.4
 gunicorn == 22.0.0