From 143fac86fa8c276f96e73023a9fce3dbcba3e06e Mon Sep 17 00:00:00 2001
From: adpham95 <32873177+adpham95@users.noreply.github.com>
Date: Tue, 5 Nov 2019 13:09:14 -0500
Subject: [PATCH] attempting to fix api timestamp in log

---
 api/server/app.py                        | 2 +-
 api/server/db/action.py                  | 2 +-
 api/server/db/appapi.py                  | 2 +-
 api/server/db/branch.py                  | 2 +-
 api/server/db/condition.py               | 2 +-
 api/server/db/dashboard.py               | 2 +-
 api/server/db/global_variable.py         | 2 +-
 api/server/db/parameter.py               | 2 +-
 api/server/db/permissions.py             | 2 +-
 api/server/db/returns.py                 | 2 +-
 api/server/db/scheduledtasks.py          | 2 +-
 api/server/db/transform.py               | 2 +-
 api/server/db/trigger.py                 | 2 +-
 api/server/db/umpire.py                  | 2 +-
 api/server/db/user.py                    | 2 +-
 api/server/db/workflow.py                | 2 +-
 api/server/db/workflow_variable.py       | 2 +-
 api/server/endpoints/appapi.py           | 2 +-
 api/server/endpoints/auth.py             | 2 +-
 api/server/endpoints/console.py          | 2 +-
 api/server/endpoints/dashboards.py       | 2 +-
 api/server/endpoints/global_variables.py | 2 +-
 api/server/endpoints/results.py          | 2 +-
 api/server/endpoints/roles.py            | 2 +-
 api/server/endpoints/scheduler.py        | 2 +-
 api/server/endpoints/settings.py         | 2 +-
 api/server/endpoints/users.py            | 2 +-
 api/server/endpoints/workflowqueue.py    | 2 +-
 api/server/endpoints/workflows.py        | 2 +-
 api/server/fastapi_config.py             | 2 +-
 api/server/scheduler.py                  | 2 +-
 api/server/security.py                   | 2 +-
 api/server/utils/helpers.py              | 2 +-
 api/server/utils/problems.py             | 2 +-
 bootloader/walkoff-compose.yml           | 3 +--
 umpire/app_repo.py                       | 2 +-
 36 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/api/server/app.py b/api/server/app.py
index c9bac4374..73061ad7d 100644
--- a/api/server/app.py
+++ b/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)
diff --git a/api/server/db/action.py b/api/server/db/action.py
index d334c0cc1..4062af27e 100644
--- a/api/server/db/action.py
+++ b/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):
diff --git a/api/server/db/appapi.py b/api/server/db/appapi.py
index 4e1379e42..1757d348b 100644
--- a/api/server/db/appapi.py
+++ b/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):
diff --git a/api/server/db/branch.py b/api/server/db/branch.py
index cfaa87af9..18a3ba23c 100644
--- a/api/server/db/branch.py
+++ b/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):
diff --git a/api/server/db/condition.py b/api/server/db/condition.py
index d01c222d2..c1b6bb830 100644
--- a/api/server/db/condition.py
+++ b/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):
diff --git a/api/server/db/dashboard.py b/api/server/db/dashboard.py
index a4d4a29bc..5b7764d07 100644
--- a/api/server/db/dashboard.py
+++ b/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):
diff --git a/api/server/db/global_variable.py b/api/server/db/global_variable.py
index c5152fd81..dec4bfd6e 100644
--- a/api/server/db/global_variable.py
+++ b/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):
diff --git a/api/server/db/parameter.py b/api/server/db/parameter.py
index 637f65588..90595bd78 100644
--- a/api/server/db/parameter.py
+++ b/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):
diff --git a/api/server/db/permissions.py b/api/server/db/permissions.py
index da3da8df6..c17cafd4c 100644
--- a/api/server/db/permissions.py
+++ b/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):
diff --git a/api/server/db/returns.py b/api/server/db/returns.py
index e61c5ff59..ede30b625 100644
--- a/api/server/db/returns.py
+++ b/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):
diff --git a/api/server/db/scheduledtasks.py b/api/server/db/scheduledtasks.py
index 116118377..a62c87090 100644
--- a/api/server/db/scheduledtasks.py
+++ b/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):
diff --git a/api/server/db/transform.py b/api/server/db/transform.py
index 1d8ea446f..ea412a1ac 100644
--- a/api/server/db/transform.py
+++ b/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):
diff --git a/api/server/db/trigger.py b/api/server/db/trigger.py
index 7baa17084..5a378ea96 100644
--- a/api/server/db/trigger.py
+++ b/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):
diff --git a/api/server/db/umpire.py b/api/server/db/umpire.py
index f5eed67d8..290a548de 100644
--- a/api/server/db/umpire.py
+++ b/api/server/db/umpire.py
@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class UploadFile(BaseModel):
diff --git a/api/server/db/user.py b/api/server/db/user.py
index e6cf40e64..9d4797ab2 100644
--- a/api/server/db/user.py
+++ b/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):
diff --git a/api/server/db/workflow.py b/api/server/db/workflow.py
index cd1e190d2..b3cf585ba 100644
--- a/api/server/db/workflow.py
+++ b/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):
diff --git a/api/server/db/workflow_variable.py b/api/server/db/workflow_variable.py
index 0e0f318e9..095446e75 100644
--- a/api/server/db/workflow_variable.py
+++ b/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):
diff --git a/api/server/endpoints/appapi.py b/api/server/endpoints/appapi.py
index 3c1c67f5b..355ee7b70 100644
--- a/api/server/endpoints/appapi.py
+++ b/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()
 
 
diff --git a/api/server/endpoints/auth.py b/api/server/endpoints/auth.py
index 7142a19f1..7b5365447 100644
--- a/api/server/endpoints/auth.py
+++ b/api/server/endpoints/auth.py
@@ -30,7 +30,7 @@
 )
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 @router.post("/login",
diff --git a/api/server/endpoints/console.py b/api/server/endpoints/console.py
index c63efd616..b0afff2d1 100644
--- a/api/server/endpoints/console.py
+++ b/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"
diff --git a/api/server/endpoints/dashboards.py b/api/server/endpoints/dashboards.py
index b8001af70..8cad799aa 100644
--- a/api/server/endpoints/dashboards.py
+++ b/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()
 
 
diff --git a/api/server/endpoints/global_variables.py b/api/server/endpoints/global_variables.py
index f81dbfdd1..21b2d394f 100644
--- a/api/server/endpoints/global_variables.py
+++ b/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()
 
diff --git a/api/server/endpoints/results.py b/api/server/endpoints/results.py
index 7d214eec3..0561319bc 100644
--- a/api/server/endpoints/results.py
+++ b/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"
diff --git a/api/server/endpoints/roles.py b/api/server/endpoints/roles.py
index 495b51ed7..b72db4c15 100644
--- a/api/server/endpoints/roles.py
+++ b/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 = [
diff --git a/api/server/endpoints/scheduler.py b/api/server/endpoints/scheduler.py
index 4f3060185..64280d4c0 100644
--- a/api/server/endpoints/scheduler.py
+++ b/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()
 
 
diff --git a/api/server/endpoints/settings.py b/api/server/endpoints/settings.py
index bd4d1cefb..7a8774b11 100644
--- a/api/server/endpoints/settings.py
+++ b/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("/",
diff --git a/api/server/endpoints/users.py b/api/server/endpoints/users.py
index 8e3e43299..df745d629 100644
--- a/api/server/endpoints/users.py
+++ b/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}
 
diff --git a/api/server/endpoints/workflowqueue.py b/api/server/endpoints/workflowqueue.py
index 24f7661d3..bdaa85e15 100644
--- a/api/server/endpoints/workflowqueue.py
+++ b/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):
diff --git a/api/server/endpoints/workflows.py b/api/server/endpoints/workflows.py
index 0d852220c..50566a48d 100644
--- a/api/server/endpoints/workflows.py
+++ b/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):
diff --git a/api/server/fastapi_config.py b/api/server/fastapi_config.py
index 184f00893..de563f3e1 100644
--- a/api/server/fastapi_config.py
+++ b/api/server/fastapi_config.py
@@ -1,6 +1,6 @@
 import logging
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("API")
 
 
 class FastApiConfig(object):
diff --git a/api/server/scheduler.py b/api/server/scheduler.py
index d9f178bdf..2e416468a 100644
--- a/api/server/scheduler.py
+++ b/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):
diff --git a/api/server/security.py b/api/server/security.py
index 6861cbff0..2a79046ed 100644
--- a/api/server/security.py
+++ b/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():
diff --git a/api/server/utils/helpers.py b/api/server/utils/helpers.py
index c05037c97..48404f844 100644
--- a/api/server/utils/helpers.py
+++ b/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):
diff --git a/api/server/utils/problems.py b/api/server/utils/problems.py
index 1b74a6c3c..655370642 100644
--- a/api/server/utils/problems.py
+++ b/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):
diff --git a/bootloader/walkoff-compose.yml b/bootloader/walkoff-compose.yml
index 0da232bb3..6088776d6 100644
--- a/bootloader/walkoff-compose.yml
+++ b/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
 
diff --git a/umpire/app_repo.py b/umpire/app_repo.py
index b8e72575d..4fccf89fb 100644
--- a/umpire/app_repo.py
+++ b/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")