Skip to content

Commit f0e5f5c

Browse files
author
harvey_xiang
committed
feat: update log
1 parent d325a31 commit f0e5f5c

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

src/memos/api/middleware/request_context.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,23 @@ async def dispatch(self, request: Request, call_next: Callable) -> Response:
8080
logger.info(f"Request started, params: {params_log}, headers: {request.headers}")
8181

8282
# Process the request
83-
response = await call_next(request)
84-
end_time = time.time()
85-
if isinstance(response, StreamingResponse):
86-
response.body_iterator = _tee_stream(response)
87-
content = "Streaming response"
88-
else:
89-
try:
90-
content = (
91-
response.body.decode("utf-8") if hasattr(response, "body") else str(response)
92-
)
93-
except Exception as e:
94-
content = f"Unable to decode response content: {e!s}"
83+
try:
84+
response = await call_next(request)
85+
end_time = time.time()
9586

96-
if response.status_code == 200:
97-
logger.info(
98-
f"Request completed: {request.url.path}, content: {content}, status: {response.status_code}, cost: {(end_time - start_time) * 1000:.2f}ms"
99-
)
100-
else:
87+
if response.status_code == 200:
88+
logger.info(
89+
f"Request completed: {request.url.path}, status: {response.status_code}, cost: {(end_time - start_time) * 1000:.2f}ms"
90+
)
91+
else:
92+
logger.error(
93+
f"Request Failed: {request.url.path}, status: {response.status_code}, cost: {(end_time - start_time) * 1000:.2f}ms"
94+
)
95+
except Exception as e:
96+
end_time = time.time()
10197
logger.error(
102-
f"Request Failed: {request.url.path}, content: {content}, status: {response.status_code}, cost: {(end_time - start_time) * 1000:.2f}ms"
98+
f"Request Exception Error: {e}, cost: {(end_time - start_time) * 1000:.2f}ms"
10399
)
100+
raise e
104101

105102
return response

src/memos/context/context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def get_current_user_type() -> str | None:
133133
context = _request_context.get()
134134
if context:
135135
return context.get("user_type")
136-
return "normal"
136+
return "opensource"
137137

138138

139139
def get_current_user_name() -> str | None:
@@ -143,7 +143,7 @@ def get_current_user_name() -> str | None:
143143
context = _request_context.get()
144144
if context:
145145
return context.get("user_name")
146-
return "unknown"
146+
return "memos"
147147

148148

149149
def get_current_context() -> RequestContext | None:

src/memos/log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def close(self):
171171
"disable_existing_loggers": False,
172172
"formatters": {
173173
"standard": {
174-
"format": "%(asctime)s | %(trace_id)s | env=%(env)s | user_type=%(user_type)s | user_name=%(user_name)s |%(name)s - %(levelname)s - %(filename)s:%(lineno)d - %(funcName)s - %(message)s"
174+
"format": "%(asctime)s | %(trace_id)s | env=%(env)s | user_type=%(user_type)s | user_name=%(user_name)s | %(name)s - %(levelname)s - %(filename)s:%(lineno)d - %(funcName)s - %(message)s"
175175
},
176176
"no_datetime": {
177177
"format": "%(trace_id)s | env=%(env)s | user_type=%(user_type)s | user_name=%(user_name)s | %(name)s - %(levelname)s - %(filename)s:%(lineno)d - %(funcName)s - %(message)s"

0 commit comments

Comments
 (0)