Loading services/TS29222_CAPIF_Publish_Service_API/Dockerfile +4 −2 Original line number Diff line number Diff line Loading @@ -12,6 +12,8 @@ COPY . /usr/src/app EXPOSE 8080 ENTRYPOINT ["python3"] # ENTRYPOINT ["python3"] ENTRYPOINT ["gunicorn"] CMD ["-m", "published_apis"] No newline at end of file # CMD ["-m", "published_apis"] CMD ["--bind", "0.0.0.0:8080", "--chdir", "/usr/src/app/published_apis", "wsgi:app"] No newline at end of file services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py→services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py +11 −11 Original line number Diff line number Diff line Loading @@ -3,15 +3,15 @@ import connexion import logging from published_apis import encoder # from published_apis import encoder import encoder from flask import Flask, jsonify, request from flask_jwt_extended import JWTManager, jwt_required, create_access_token from pymongo import MongoClient from .config import Config # from .config import Config from config import Config from logging.handlers import RotatingFileHandler from .core.consumer_messager import Subscriber from flask_executor import Executor from core.consumer_messager import Subscriber import os from fluent import sender from flask_executor import Executor Loading @@ -24,10 +24,9 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.instrumentation.redis import RedisInstrumentor NAME = "Publish-Service" def configure_monitoring(app, config): resource = Resource(attributes={"service.name": NAME}) Loading Loading @@ -86,7 +85,6 @@ def configure_monitoring(app, config): l.addHandler(FluentBitHandler()) def configure_logging(app): del app.logger.handlers[:] loggers = [app.logger, ] Loading Loading @@ -114,6 +112,7 @@ def verbose_formatter(): datefmt='%d/%m/%Y %H:%M:%S' ) app = connexion.App(__name__, specification_dir='./openapi/') app.app.json_encoder = encoder.JSONEncoder app.add_api('openapi.yaml', Loading @@ -133,10 +132,11 @@ if eval(os.environ.get("MONITORING").lower().capitalize()): executor = Executor(app.app) subscriber = Subscriber() @app.app.before_first_request def up_listener(): executor.submit(subscriber.listen) if __name__ == '__main__': app.run(debug=True, port=8080) # if __name__ == '__main__': # app.run(debug=True, port=8080) services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py +1 −1 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ import os class Config: def __init__(self): self.cached = 0 self.file="./config.yaml" self.file="../config.yaml" self.my_config = {} stamp = os.stat(self.file).st_mtime Loading services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py +2 −8 Original line number Diff line number Diff line import connexion from published_apis.models.service_api_description import ServiceAPIDescription # noqa: E501 from ..core import serviceapidescriptions from ..models.service_api_description import ServiceAPIDescription # noqa: E501 from ..core.serviceapidescriptions import PublishServiceOperations from ..core.publisher import Publisher import json from flask import Response, request, current_app from flask_jwt_extended import jwt_required, get_jwt_identity from flask import current_app from ..encoder import JSONEncoder from ..models.problem_details import ProblemDetails from cryptography import x509 from cryptography.hazmat.backends import default_backend from ..core.validate_user import ControlAccess from functools import wraps import pymongo service_operations = PublishServiceOperations() Loading services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py +1 −1 Original line number Diff line number Diff line from abc import ABC, abstractmethod from ..db.db import MongoDatabse from db.db import MongoDatabse class Resource(ABC): Loading Loading
services/TS29222_CAPIF_Publish_Service_API/Dockerfile +4 −2 Original line number Diff line number Diff line Loading @@ -12,6 +12,8 @@ COPY . /usr/src/app EXPOSE 8080 ENTRYPOINT ["python3"] # ENTRYPOINT ["python3"] ENTRYPOINT ["gunicorn"] CMD ["-m", "published_apis"] No newline at end of file # CMD ["-m", "published_apis"] CMD ["--bind", "0.0.0.0:8080", "--chdir", "/usr/src/app/published_apis", "wsgi:app"] No newline at end of file
services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py→services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py +11 −11 Original line number Diff line number Diff line Loading @@ -3,15 +3,15 @@ import connexion import logging from published_apis import encoder # from published_apis import encoder import encoder from flask import Flask, jsonify, request from flask_jwt_extended import JWTManager, jwt_required, create_access_token from pymongo import MongoClient from .config import Config # from .config import Config from config import Config from logging.handlers import RotatingFileHandler from .core.consumer_messager import Subscriber from flask_executor import Executor from core.consumer_messager import Subscriber import os from fluent import sender from flask_executor import Executor Loading @@ -24,10 +24,9 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.instrumentation.redis import RedisInstrumentor NAME = "Publish-Service" def configure_monitoring(app, config): resource = Resource(attributes={"service.name": NAME}) Loading Loading @@ -86,7 +85,6 @@ def configure_monitoring(app, config): l.addHandler(FluentBitHandler()) def configure_logging(app): del app.logger.handlers[:] loggers = [app.logger, ] Loading Loading @@ -114,6 +112,7 @@ def verbose_formatter(): datefmt='%d/%m/%Y %H:%M:%S' ) app = connexion.App(__name__, specification_dir='./openapi/') app.app.json_encoder = encoder.JSONEncoder app.add_api('openapi.yaml', Loading @@ -133,10 +132,11 @@ if eval(os.environ.get("MONITORING").lower().capitalize()): executor = Executor(app.app) subscriber = Subscriber() @app.app.before_first_request def up_listener(): executor.submit(subscriber.listen) if __name__ == '__main__': app.run(debug=True, port=8080) # if __name__ == '__main__': # app.run(debug=True, port=8080)
services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py +1 −1 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ import os class Config: def __init__(self): self.cached = 0 self.file="./config.yaml" self.file="../config.yaml" self.my_config = {} stamp = os.stat(self.file).st_mtime Loading
services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py +2 −8 Original line number Diff line number Diff line import connexion from published_apis.models.service_api_description import ServiceAPIDescription # noqa: E501 from ..core import serviceapidescriptions from ..models.service_api_description import ServiceAPIDescription # noqa: E501 from ..core.serviceapidescriptions import PublishServiceOperations from ..core.publisher import Publisher import json from flask import Response, request, current_app from flask_jwt_extended import jwt_required, get_jwt_identity from flask import current_app from ..encoder import JSONEncoder from ..models.problem_details import ProblemDetails from cryptography import x509 from cryptography.hazmat.backends import default_backend from ..core.validate_user import ControlAccess from functools import wraps import pymongo service_operations = PublishServiceOperations() Loading
services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py +1 −1 Original line number Diff line number Diff line from abc import ABC, abstractmethod from ..db.db import MongoDatabse from db.db import MongoDatabse class Resource(ABC): Loading