Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove 'R2R_PR2R_PROJECT_NAME' log #2000

Merged
merged 1 commit into from
Feb 22, 2025
Merged

Remove 'R2R_PR2R_PROJECT_NAME' log #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions py/core/main/app_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
import logging
import os
from contextlib import asynccontextmanager
from typing import Optional

Expand Down Expand Up @@ -81,16 +81,17 @@ async def create_r2r_app(
)
logging.info(f"Environment R2R_PROJECT_NAME: {os.getenv('R2R_PROJECT_NAME')}")

logging.info(f"Environment R2R_POSTGRES_HOST: {os.getenv('R2R_POSTGRES_HOST')}")
logging.info(
f"Environment R2R_POSTGRES_HOST: {os.getenv('R2R_POSTGRES_HOST')}"
)
logging.info(
f"Environment R2R_POSTGRES_DBNAME: {os.getenv('R2R_POSTGRES_DBNAME')}"
)
logging.info(f"Environment R2R_POSTGRES_PORT: {os.getenv('R2R_POSTGRES_PORT')}")
logging.info(
f"Environment R2R_POSTGRES_PASSWORD: {os.getenv('R2R_POSTGRES_PASSWORD')}"
f"Environment R2R_POSTGRES_PORT: {os.getenv('R2R_POSTGRES_PORT')}"
)
logging.info(
f"Environment R2R_PROJECT_NAME: {os.getenv('R2R_PR2R_PROJECT_NAME')}"
f"Environment R2R_POSTGRES_PASSWORD: {os.getenv('R2R_POSTGRES_PASSWORD')}"
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the duplicate/wrong env var log (R2R_PR2R_PROJECT_NAME). Logging the DB password may expose sensitive info in production. Consider redacting or removing sensitive credentials.

Suggested change
f"Environment R2R_POSTGRES_PASSWORD: {os.getenv('R2R_POSTGRES_PASSWORD')}"


# Create the FastAPI app
Expand Down
13 changes: 10 additions & 3 deletions py/core/utils/logging_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ def filter(self, record: logging.LogRecord) -> bool:


log_level = os.environ.get("R2R_LOG_LEVEL", "INFO").upper()
log_console_formatter = os.environ.get("R2R_LOG_CONSOLE_FORMATTER", "colored").lower() # colored or json
log_console_formatter = os.environ.get(
"R2R_LOG_CONSOLE_FORMATTER", "colored"
).lower() # colored or json

log_dir = Path.cwd() / "logs"
log_dir.mkdir(exist_ok=True)
Expand Down Expand Up @@ -104,8 +106,12 @@ def filter(self, record: logging.LogRecord) -> bool:
},
"json": {
"()": "pythonjsonlogger.json.JsonFormatter",
"format": "%(name)s %(levelname)s %(message)s", # these become keys in the JSON log
"rename_fields": {"asctime": "time", "levelname": "level", "name": "logger"},
"format": "%(name)s %(levelname)s %(message)s", # these become keys in the JSON log
"rename_fields": {
"asctime": "time",
"levelname": "level",
"name": "logger",
},
},
},
"handlers": {
Expand Down Expand Up @@ -149,6 +155,7 @@ def filter(self, record: logging.LogRecord) -> bool:
},
}


def configure_logging() -> Path:
logging.config.dictConfig(log_config)

Expand Down
Loading