highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-19 12:03:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add fix for logging (#2431)

Browse Source
This commit is contained in:
pablodanswer
2024-09-13 11:27:20 -07:00
committed by GitHub
parent 566f44fcd6
commit fc98c560a4
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/Dockerfile
View File

@@ -9,7 +9,8 @@ founders@danswer.ai for more information. Please visit https://github.com/danswe
# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
ARG DANSWER_VERSION=0.3-dev ARG DANSWER_VERSION=0.3-dev
ENV DANSWER_VERSION=${DANSWER_VERSION} ENV DANSWER_VERSION=${DANSWER_VERSION} \
DANSWER_RUNNING_IN_DOCKER="true"
RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}" RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
# Install system dependencies # Install system dependencies

5
backend/Dockerfile.model_server
View File

@@ -8,7 +8,10 @@ visit https://github.com/danswer-ai/danswer."
# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
ARG DANSWER_VERSION=0.3-dev ARG DANSWER_VERSION=0.3-dev
ENV DANSWER_VERSION=${DANSWER_VERSION} ENV DANSWER_VERSION=${DANSWER_VERSION} \
DANSWER_RUNNING_IN_DOCKER="true"
RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}" RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
COPY ./requirements/model_server.txt /tmp/requirements.txt COPY ./requirements/model_server.txt /tmp/requirements.txt

9
backend/danswer/utils/logger.py
View File

@@ -124,6 +124,13 @@ def get_standard_formatter() -> ColoredFormatter:
) )
DANSWER_DOCKER_ENV_STR = "DANSWER_RUNNING_IN_DOCKER"
def is_running_in_container() -> bool:
return os.getenv(DANSWER_DOCKER_ENV_STR) == "true"
def setup_logger( def setup_logger(
name: str = __name__, name: str = __name__,
log_level: int = get_log_level_from_str(), log_level: int = get_log_level_from_str(),
@@ -151,7 +158,7 @@ def setup_logger(
uvicorn_logger.addHandler(handler) uvicorn_logger.addHandler(handler)
uvicorn_logger.setLevel(log_level) uvicorn_logger.setLevel(log_level)
is_containerized = os.path.exists("/.dockerenv") is_containerized = is_running_in_container()
if LOG_FILE_NAME and (is_containerized or DEV_LOGGING_ENABLED): if LOG_FILE_NAME and (is_containerized or DEV_LOGGING_ENABLED):
log_levels = ["debug", "info", "notice"] log_levels = ["debug", "info", "notice"]
for level in log_levels: for level in log_levels: