Commit 7ae2a0e7 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

Move Discover API from testing to production server & remove unnecessary imports

parent d140ad20
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ COPY . /usr/src/app

EXPOSE 8080

ENTRYPOINT ["python3"]
ENTRYPOINT ["gunicorn"]

CMD ["-m", "service_apis"]
 No newline at end of file
CMD ["--bind", "0.0.0.0:8080", "--chdir", "/usr/src/app/service_apis", "wsgi:app"]
 No newline at end of file
+3 −1
Original line number Diff line number Diff line
@@ -20,3 +20,5 @@ opentelemetry-api == 1.17.0
opentelemetry-sdk == 1.17.0
flask_executor == 1.0.0
flask_executor == 1.0.0
gunicorn==22.0.0
packaging==24.0
 No newline at end of file
+6 −10
Original line number Diff line number Diff line
@@ -2,18 +2,15 @@

import connexion

from service_apis import encoder
import encoder

import pymongo
import logging
from flask import Flask, jsonify, request
from flask_jwt_extended import JWTManager, jwt_required, create_access_token
from pymongo import MongoClient
from logging.handlers import RotatingFileHandler
from .config import Config
from config import Config

import os
from fluent import sender
from flask_executor import Executor
from opentelemetry.instrumentation.flask import FlaskInstrumentor
from opentelemetry import trace
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
@@ -23,10 +20,9 @@ from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import BatchSpanProcessor
from opentelemetry.instrumentation.redis import RedisInstrumentor



NAME = "Discover-Service"


def configure_monitoring(app, config):

    resource = Resource(attributes={"service.name": NAME})
@@ -127,5 +123,5 @@ if eval(os.environ.get("MONITORING").lower().capitalize()):
jwt = JWTManager(app.app)


if __name__ == '__main__':
    app.run(debug=True, port=8080)
# if __name__ == '__main__':
#     app.run(debug=True, port=8080)
+1 −1
Original line number Diff line number Diff line
@@ -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
+1 −8
Original line number Diff line number Diff line
import sys

from service_apis.core.discoveredapis import DiscoverApisOperations
import json
from ..core.discoveredapis import DiscoverApisOperations
from flask import Response, request, current_app
from service_apis.encoder import JSONEncoder
from service_apis.models.problem_details import ProblemDetails
from cryptography import x509
from cryptography.hazmat.backends import default_backend
import pymongo

discover_apis = DiscoverApisOperations()

Loading