attempting to fix api timestamp in log

api/server/app.py

@@ -22,7 +22,7 @@
 from api.server.utils.socketio import sio
 from common.config import static, config
 
-logging.basicConfig(level=logging.info, format="{asctime} - {name} - {levelname}:{message}", style='{')
+logging.basicConfig(level=logging.INFO, format="{asctime} - {name} - {levelname}:{message}", style='{')
 logger = logging.getLogger(__name__)
 
 _app = FastAPI(docs_url=None, redoc_url=None, openapi_url=None)

api/server/db/action.py

@@ -6,7 +6,7 @@
 from api.server.db.parameter import ParameterApiModel, ParameterModel  # ParameterApiSchema, Parameter, ParameterSchema,
 from api.server.db.returns import ReturnApiModel  # ReturnApiSchema,
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class ActionApiModel(IDBaseModel):

api/server/db/appapi.py

@@ -8,7 +8,7 @@
 from api.server.db import IDBaseModel
 from api.server.db.action import ActionApiModel  # ActionApiSchema,
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class AppApiContactModel(BaseModel):

api/server/db/branch.py

@@ -3,7 +3,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class BranchModel(IDBaseModel):

api/server/db/condition.py

@@ -4,7 +4,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class ConditionModel(IDBaseModel):

api/server/db/dashboard.py

@@ -4,7 +4,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class WidgetModel(IDBaseModel):

api/server/db/global_variable.py

@@ -4,7 +4,7 @@
 from api.server.db import IDBaseModel
 from api.server.db.permissions import PermissionsModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class GlobalVariable(IDBaseModel):

api/server/db/parameter.py

@@ -19,7 +19,7 @@
 #
 # from common.workflow_types import ParameterVariant
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class ParameterApiModel(IDBaseModel):

api/server/db/permissions.py

@@ -9,7 +9,7 @@
 from api.server.db.user_init import DefaultRoleUUID
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class AccessLevel(int, Enum):

api/server/db/returns.py

@@ -12,7 +12,7 @@
 # from api.server.db import Base, BaseSchema
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class ReturnApiModel(IDBaseModel):

api/server/db/scheduledtasks.py

@@ -8,7 +8,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class TaskType(str, Enum):

api/server/db/transform.py

@@ -4,7 +4,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class TransformModel(IDBaseModel):

api/server/db/trigger.py

@@ -4,7 +4,7 @@
 
 from api.server.db import IDBaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class TriggerModel(IDBaseModel):

api/server/db/umpire.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class UploadFile(BaseModel):

api/server/db/user.py

@@ -10,7 +10,7 @@
 from api.server.db import IDBaseModel
 from api.server.db.mongo import mongo
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class EditUser(BaseModel):

api/server/db/workflow.py

@@ -20,7 +20,7 @@
 from common.helpers import validate_uuid
 from common.workflow_types import ParameterVariant
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class CopyWorkflowModel(BaseModel):

api/server/db/workflow_variable.py

@@ -4,7 +4,7 @@
 from api.server.db import IDBaseModel
 from api.server.utils.helpers import JSONOrString
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class WorkflowVariableModel(IDBaseModel):

api/server/endpoints/appapi.py

@@ -10,7 +10,7 @@
 from api.server.db.mongo import get_mongo_c
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 

api/server/endpoints/auth.py

@@ -30,7 +30,7 @@
 )
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 @router.post("/login",

api/server/endpoints/console.py

@@ -14,7 +14,7 @@
 console_stream_subs = set()
 USERS = []
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 CONSOLE_STREAM_GLOB = "console_stream"

api/server/endpoints/dashboards.py

@@ -9,7 +9,7 @@
 from api.server.db.mongo import get_mongo_c
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 

api/server/endpoints/global_variables.py

@@ -18,7 +18,7 @@
 from common.config import config
 from common.helpers import fernet_encrypt, fernet_decrypt
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 router = APIRouter()
 

api/server/endpoints/results.py

@@ -13,7 +13,7 @@
 from common.config import config, static
 from common.redis_helpers import connect_to_aioredis_pool
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 WORKFLOW_STREAM_GLOB = "workflow_stream"

api/server/endpoints/roles.py

@@ -10,7 +10,7 @@
 from api.server.utils.problems import (UnauthorizedException, UniquenessException, DoesNotExistException)
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 hidden_roles = [

api/server/endpoints/scheduler.py

@@ -14,7 +14,7 @@
 from api.server.utils.problems import InvalidInputException, DoesNotExistException
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 

api/server/endpoints/settings.py

@@ -7,7 +7,7 @@
 from api.server.db.settings import SettingsModel
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 
 @router.get("/",

api/server/endpoints/users.py

@@ -17,7 +17,7 @@
                                        DoesNotExistException)
 from common import async_mongo_helpers as mongo_helpers
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 router = APIRouter()
 ignore_password = {"password": False}
 

api/server/endpoints/workflowqueue.py

@@ -25,7 +25,7 @@
 from common.redis_helpers import connect_to_aioredis_pool
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 # def workflow_status_getter(execution_id, app_api_col: AsyncIOMotorCollection):

api/server/endpoints/workflows.py

@@ -21,7 +21,7 @@
 from common import async_mongo_helpers as mongo_helpers
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 async def set_permissions(new_workflow: WorkflowModel, curr_user_id: UUID, walkoff_db: AsyncIOMotorDatabase):

api/server/fastapi_config.py

@@ -1,6 +1,6 @@
 import logging
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class FastApiConfig(object):

api/server/scheduler.py

@@ -11,7 +11,7 @@
 
 from api.server.utils.problems import InvalidInputException
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class InvalidTriggerArgs(Exception):

api/server/security.py

@@ -21,7 +21,7 @@
 
 app = FastAPI()
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/token")
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 async def load_secret_key():

api/server/utils/helpers.py

@@ -5,7 +5,7 @@
 from inspect import signature as getsignature
 from uuid import uuid4
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 def __list_valid_directories(path):

api/server/utils/problems.py

@@ -4,7 +4,7 @@
 from fastapi.exceptions import HTTPException
 from starlette.responses import JSONResponse
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class ProblemException(HTTPException):

bootloader/walkoff-compose.yml

@@ -51,6 +51,7 @@ services:
     depends_on:
       - resource_redis
       - resource_mongo
+      - core_socketio
     volumes:
       - ./apps:/app/apps
       - ./api/client/dist:/app/api/client/dist
@@ -74,8 +75,6 @@ services:
       # - walkoff_redis_key
     configs:
       - common_env.yml
-    depends_on:
-      - core_api
     # volumes:
     #   - ./api/client/dist:/app/api/client/dist
 

umpire/app_repo.py

@@ -14,7 +14,7 @@
 from common.docker_helpers import get_project
 from common.helpers import get_walkoff_auth_header
 
-logging.basicConfig(level=logging.info, format="{asctime} - {name} - {levelname}:{message}", style='{')
+logging.basicConfig(level=logging.INFO, format="{asctime} - {name} - {levelname}:{message}", style='{')
 logger = logging.getLogger("AppRepo")
 
 compose_logger = logging.getLogger("compose.config.config")