Skip to content

Commit dbfac18

Browse files
committed
Fixed request logging
1 parent 6878967 commit dbfac18

1 file changed

Lines changed: 21 additions & 13 deletions

File tree

  • whatsapp_api_client_python

whatsapp_api_client_python/API.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json
22
import logging
3-
from typing import Optional
3+
from typing import NoReturn, Optional
44

55
from requests import Response, Session
66
from requests.adapters import HTTPAdapter, Retry
@@ -94,23 +94,31 @@ def request(
9494

9595
return GreenAPIResponse(response.status_code, response.text)
9696

97-
def __handle_response(self, response: Response):
98-
if response.status_code != 200:
99-
error_message = (
100-
f"Request was failed with status code: {response.status_code}."
101-
)
102-
103-
if self.raise_errors:
104-
raise GreenAPIError(error_message)
105-
self.logger.log(logging.ERROR, error_message)
106-
107-
if self.debug_mode:
97+
def __handle_response(self, response: Response) -> Optional[NoReturn]:
98+
status_code = response.status_code
99+
if status_code != 200 or self.debug_mode:
108100
data = json.dumps(
109101
json.loads(response.text), ensure_ascii=False, indent=4
110102
)
111103

104+
if status_code != 200:
105+
data = json.dumps(
106+
json.loads(response.text), ensure_ascii=False, indent=4
107+
)
108+
109+
error_message = (
110+
f"Request was failed with status code: {status_code}."
111+
f" Data: {data}"
112+
)
113+
114+
if self.raise_errors:
115+
raise GreenAPIError(error_message)
116+
self.logger.log(logging.ERROR, error_message)
117+
118+
return None
119+
112120
self.logger.log(
113-
logging.DEBUG, f"Request was successful with data: {data}\n"
121+
logging.DEBUG, f"Request was successful with data: {data}"
114122
)
115123

116124
def __prepare_logger(self) -> None:

0 commit comments

Comments
 (0)