Skip to content

Commit f43d1bb

Browse files
committed
chore: improve logging
Signed-off-by: Manish Dait <daitmanish88@gmail.com>
1 parent 7b76895 commit f43d1bb

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

tck/errors.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,19 @@ def wrapper(*args, **kwargs):
105105
except JsonRpcError:
106106
raise
107107
except PrecheckError as e:
108-
logger.error(f"PrecheckError (status: {ResponseCode(e.status).name}, method: {func.__name__})")
108+
logger.error(f"PrecheckError (method: {func.__name__}, status: {ResponseCode(e.status).name})")
109109
raise JsonRpcError.hiero_error({"status": ResponseCode(e.status).name}) from e
110110

111111
except ReceiptStatusError as e:
112-
logger.error(f"ReceiptStatusError (status: {ResponseCode(e.status).name}, method: {func.__name__})")
112+
logger.error(f"ReceiptStatusError (method: {func.__name__}, status: {ResponseCode(e.status).name})")
113113
raise JsonRpcError.hiero_error({"status": ResponseCode(e.status).name}) from e
114114

115115
except MaxAttemptsError as e:
116-
logger.error(f"MaxAttemptsError in {func.__name__}: {e.message}")
116+
logger.error(f"MaxAttemptsError (method: {func.__name__}, error: {e.message})")
117117
raise JsonRpcError.hiero_error(message=e.message) from e
118118

119119
except Exception as e:
120-
logger.exception("Unhandled error in RPC handler")
120+
logger.error(f"InternalError (method: {func.__name__}) error: {str(e)}")
121121
raise JsonRpcError.internal_error(message="Internal error") from e
122122

123123
return wrapper

tck/handlers/registry.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ def dispatch(method_name: str, params: Any) -> Any:
4747
handler = get_handler(method_name)
4848

4949
if handler is None:
50+
logger.warning(
51+
f"MethodNotFoundError (method: {method_name}) error: The requested RPC method is not registered."
52+
)
5053
raise JsonRpcError.method_not_found_error(message=f"Method not found: {method_name}")
5154

5255
try:
@@ -62,6 +65,7 @@ def dispatch(method_name: str, params: Any) -> Any:
6265
param_type = hints.get(param_name, parameters[0].annotation)
6366
params = param_type.parse_json_params(params)
6467
except (TypeError, ValueError) as e:
68+
logger.error(f"InvalidParamsError (method: {method_name}) error: {str(e)}")
6569
raise JsonRpcError.invalid_params_error(data=str(e)) from e
6670

6771
result = handler(params)
@@ -71,7 +75,7 @@ def dispatch(method_name: str, params: Any) -> Any:
7175
except JsonRpcError:
7276
raise
7377
except Exception as e:
74-
logger.exception(f"Unexpected error executing {method_name}")
78+
logger.error(f"InternalError (method: {method_name}) error: {str(e)}")
7579
raise JsonRpcError.internal_error(message="An unexpected system error occurred.") from e
7680

7781

@@ -81,8 +85,8 @@ def safe_dispatch(method_name: str, params: Any, request_id: str | int | None) -
8185
return dispatch(method_name, params)
8286
except JsonRpcError as e:
8387
return build_json_rpc_error_response(e, request_id)
84-
except Exception:
85-
logger.exception("Fatal runtime dispatch error")
88+
except Exception as e:
89+
logger.error(f"InternalError (method: {method_name}) error: {str(e)}")
8690
error = JsonRpcError.internal_error(message="An unexpected system error occurred.")
8791
return build_json_rpc_error_response(error, request_id)
8892

0 commit comments

Comments
 (0)