Skip to content
Snippets Groups Projects
Commit f668de29 authored by Xiao Gui's avatar Xiao Gui
Browse files

Merge branch 'dev' into staging

parents 3ea0ceb9 1ddedbbd
No related branches found
No related tags found
No related merge requests found
......@@ -59,3 +59,19 @@ if HOST_PATHNAME:
app.mount(HOST_PATHNAME, _app)
ready_flag = True
DO_NOT_LOGS = (
"/ready",
"/metrics",
)
import logging
class EndpointLoggingFilter(logging.Filter):
"""Custom logger filter. Do not log metrics, ready endpoint."""
def filter(self, record: logging.LogRecord) -> bool:
message = record.getMessage()
return all(
message.find(do_not_log) == -1 for do_not_log in DO_NOT_LOGS
)
logging.getLogger("uvicorn.access").addFilter(EndpointLoggingFilter())
......@@ -21,7 +21,7 @@ BUILD_TEXT = os.getenv("BUILD_TEXT", "")
# REDIS env var
REDIS_PROTO = os.getenv("REDIS_PROTO")
REDIS_ADDR = os.getenv("REDIS_ADDR") or os.getenv("REDIS_RATE_LIMITING_DB_EPHEMERAL_PORT_6379_TCP_PROTO") or "localhost"
REDIS_ADDR = os.getenv("REDIS_ADDR") or os.getenv("REDIS_RATE_LIMITING_DB_EPHEMERAL_PORT_6379_TCP_ADDR") or "localhost"
REDIS_PORT = os.getenv("REDIS_PORT") or os.getenv("REDIS_RATE_LIMITING_DB_EPHEMERAL_PORT_6379_TCP_PORT") or "6379"
REDIS_USERNAME = os.getenv("REDIS_USERNAME")
REDIS_PASSWORD = os.getenv("REDIS_PASSWORD")
......
......@@ -17,7 +17,7 @@ _redisstore = RedisEphStore.Persistent()
PLUGINS: List[str] = []
try:
PLUGINS = [
v
v.strip()
for v in [*V2_7_PLUGIN_URLS.split(";"), *V2_7_STAGING_PLUGIN_URLS.split(";")]
if v # remove empty strings
]
......@@ -64,7 +64,7 @@ def _get_manifest(url: str):
return return_obj
except Exception as e:
logger.error(f"Error retrieving: {url}")
logger.error(f"Error retrieving: {url}, {str(e)}")
@router.get("/manifests")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment