pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-21 13:32:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refact: Update loggings (#12014)

Browse Source 
### What problem does this PR solve?

Refact: Update loggings

### Type of change

- [x] Refactoring
This commit is contained in:
Magicbook1108
2025-12-18 14:18:03 +08:00
committed by GitHub
parent 5cd1a678c8
commit 2331b3a270
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/http_client.py
View File

@ -144,24 +144,23 @@ async def async_request(
method=method, url=url, headers=headers, **kwargs method=method, url=url, headers=headers, **kwargs
) )
duration = time.monotonic() - start duration = time.monotonic() - start
log_url = "<SENSITIVE ENDPOINT>" if _is_sensitive_url(url) else _redact_sensitive_url_params(url) if not _is_sensitive_url(url):
logger.debug( log_url = _redact_sensitive_url_params(url)
f"async_request {method} {log_url} -> {response.status_code} in {duration:.3f}s" logger.debug(f"async_request {method} {log_url} -> {response.status_code} in {duration:.3f}s")
)
return response return response
except httpx.RequestError as exc: except httpx.RequestError as exc:
last_exc = exc last_exc = exc
if attempt >= retries: if attempt >= retries:
log_url = "<SENSITIVE ENDPOINT>" if _is_sensitive_url(url) else _redact_sensitive_url_params(url) if not _is_sensitive_url(url):
logger.warning( log_url = _redact_sensitive_url_params(url)
f"async_request exhausted retries for {method} {log_url}" logger.warning(f"async_request exhausted retries for {method} {log_url}")
)
raise raise
delay = _get_delay(backoff_factor, attempt) delay = _get_delay(backoff_factor, attempt)
log_url = "<SENSITIVE ENDPOINT>" if _is_sensitive_url(url) else _redact_sensitive_url_params(url) if not _is_sensitive_url(url):
logger.warning( log_url = _redact_sensitive_url_params(url)
f"async_request attempt {attempt + 1}/{retries + 1} failed for {method} {log_url}; retrying in {delay:.2f}s" logger.warning(
) f"async_request attempt {attempt + 1}/{retries + 1} failed for {method} {log_url}; retrying in {delay:.2f}s"
)
await asyncio.sleep(delay) await asyncio.sleep(delay)
raise last_exc # pragma: no cover raise last_exc # pragma: no cover

6
rag/utils/opendal_conn.py
View File

@ -45,9 +45,9 @@ def get_opendal_config():
# Only include non-sensitive keys in logs. Do NOT # Only include non-sensitive keys in logs. Do NOT
# add 'password' or any key containing embedded credentials # add 'password' or any key containing embedded credentials
# (like 'connection_string'). # (like 'connection_string').
safe_log_keys = ['scheme', 'host', 'port', 'database', 'table'] SAFE_LOG_KEYS = ['scheme', 'host', 'port', 'database', 'table'] # explicitly non-sensitive
loggable_kwargs = {k: v for k, v in kwargs.items() if k in safe_log_keys} loggable_kwargs = {k: v for k, v in kwargs.items() if k in SAFE_LOG_KEYS}
logging.info("Loaded OpenDAL configuration (non sensitive): %s", loggable_kwargs) logging.info("Loaded OpenDAL configuration (non sensitive fields only): %s", loggable_kwargs)
# For safety, explicitly remove sensitive keys from kwargs after use # For safety, explicitly remove sensitive keys from kwargs after use
if "password" in kwargs: if "password" in kwargs: