From 32f8b3ad77b5f80ce3fb4eb06e6b241c5f3cef7d Mon Sep 17 00:00:00 2001 From: symvation <129673064+symvation@users.noreply.github.com> Date: Tue, 1 Jul 2025 10:49:43 +0800 Subject: [PATCH] Fix: the output log is incorrect (#8577) ### What problem does this PR solve? Fix: the output log is incorrect ### Type of change - [ ] Bug Fix (non-breaking change which fixes an issue) Co-authored-by: liang --- rag/utils/es_conn.py | 6 +++--- rag/utils/opensearch_coon.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rag/utils/es_conn.py b/rag/utils/es_conn.py index 5e1f6ceb0..c66c7edff 100644 --- a/rag/utils/es_conn.py +++ b/rag/utils/es_conn.py @@ -254,7 +254,7 @@ class ESConnection(DocStoreConnection): if str(e).find("Timeout") > 0: continue raise e - logger.error("ESConnection.search timeout for 3 times!") + logger.error(f"ESConnection.search timeout for {ATTEMPT_TIME} times!") raise Exception("ESConnection.search timeout.") def get(self, chunkId: str, indexName: str, knowledgebaseIds: list[str]) -> dict | None: @@ -274,7 +274,7 @@ class ESConnection(DocStoreConnection): if str(e).find("Timeout") > 0: continue raise e - logger.error("ESConnection.get timeout for 3 times!") + logger.error(f"ESConnection.get timeout for {ATTEMPT_TIME} times!") raise Exception("ESConnection.get timeout.") def insert(self, documents: list[dict], indexName: str, knowledgebaseId: str = None) -> list[str]: @@ -562,5 +562,5 @@ class ESConnection(DocStoreConnection): except Exception: logger.exception("ESConnection.sql got exception") return None - logger.error("ESConnection.sql timeout for 3 times!") + logger.error(f"ESConnection.sql timeout for {ATTEMPT_TIME} times!") return None diff --git a/rag/utils/opensearch_coon.py b/rag/utils/opensearch_coon.py index 4a8fd0889..4fd09b782 100644 --- a/rag/utils/opensearch_coon.py +++ b/rag/utils/opensearch_coon.py @@ -262,7 +262,7 @@ class OSConnection(DocStoreConnection): if str(e).find("Timeout") > 0: continue raise e - logger.error("OSConnection.search timeout for 3 times!") + logger.error(f"OSConnection.search timeout for {ATTEMPT_TIME} times!") raise Exception("OSConnection.search timeout.") def get(self, chunkId: str, indexName: str, knowledgebaseIds: list[str]) -> dict | None: @@ -282,7 +282,7 @@ class OSConnection(DocStoreConnection): if str(e).find("Timeout") > 0: continue raise e - logger.error("OSConnection.get timeout for 3 times!") + logger.error(f"OSConnection.get timeout for {ATTEMPT_TIME} times!") raise Exception("OSConnection.get timeout.") def insert(self, documents: list[dict], indexName: str, knowledgebaseId: str = None) -> list[str]: @@ -557,5 +557,5 @@ class OSConnection(DocStoreConnection): except Exception: logger.exception("OSConnection.sql got exception") return None - logger.error("OSConnection.sql timeout for 3 times!") + logger.error(f"OSConnection.sql timeout for {ATTEMPT_TIME} times!") return None