improved logging on response issues #106

Author: bensteUEM

churchtools_api/calendar.py

@@ -37,7 +37,7 @@ def get_calendars(self) -> list[dict]:
             return response_content['data'].copy()
         else:
             logger.warning(
-                "Something went wrong fetching events: %s", response.status_code)
+                "%s Something went wrong fetching events: %s", response.status_code, response.content)
 
     def get_calendar_appointments(
             self, calendar_ids: list, **kwargs) -> list[dict]:
@@ -128,5 +128,5 @@ def get_calendar_appointments(
 
         else:
             logger.warning(
-                "Something went wrong fetching calendar appointments: %s",
-                response.status_code)
+                "%s Something went wrong fetching calendar appointments:  %s", response.status_code, response.content
+            )

churchtools_api/churchtools_api.py

@@ -195,8 +195,8 @@ def get_global_permissions(self) -> dict:
             return response_data
         else:
             logger.warning(
-                "Something went wrong fetching global permissions: {}".format(
-                    response.status_code))
+                "%s Something went wrong fetching global permissions: %s",
+                    response.status_code, response_content)
 
     def get_services(self, **kwargs):
         """
@@ -264,4 +264,4 @@ def get_tags(self, type='songs'):
             return response_content['data']
         else:
             logger.warning(
-                "Something went wrong fetching Song-tags: {}".format(response.status_code))
+                "%s Something went wrong fetching Song-tags: %s",response.status_code, response.content)

churchtools_api/events.py

@@ -86,8 +86,7 @@ def get_events(self, **kwargs) -> list[dict]:
             return [response_data] if isinstance(response_data, dict) else response_data
         else:
             logger.warning(
-                "Something went wrong fetching events: {}".format(
-                    response.status_code))
+                "%s Something went wrong fetching events: %s", response.status_code, response.content)
 
     def get_event_by_calendar_appointment(self, appointment_id: int,
                                           start_date: str | datetime) -> dict:

churchtools_api/files.py

@@ -174,7 +174,7 @@ def file_download(self, filename, domain_type,
             return StateOK
         else:
             logger.warning(
-                "Something went wrong fetching SongArrangement-Files: {}".format(response.status_code))
+                "%s Something went wrong fetching SongArrangement-Files: %s", response.status_code, response.content)
 
     def file_download_from_url(self, file_url, target_path):
         """
@@ -189,10 +189,10 @@ def file_download_from_url(self, file_url, target_path):
         :rtype: bool
         """
         # NOTE the stream=True parameter below
-        with self.session.get(url=file_url, stream=True) as r:
-            if r.status_code == 200:
+        with self.session.get(url=file_url, stream=True) as response:
+            if response.status_code == 200:
                 with open(target_path, 'wb') as f:
-                    for chunk in r.iter_content(chunk_size=8192):
+                    for chunk in response.iter_content(chunk_size=8192):
                         # If you have chunk encoded response uncomment if
                         # and set chunk_size parameter to None.
                         # if chunk:
@@ -201,6 +201,5 @@ def file_download_from_url(self, file_url, target_path):
                 return True
             else:
                 logger.warning(
-                    "Something went wrong during file_download: {}".format(
-                        r.status_code))
+                    "%s Something went wrong during file_download: %s", response.status_code, response.content)
                 return False

churchtools_api/groups.py

@@ -70,8 +70,7 @@ def get_groups_hierarchies(self):
 
         else:
             logger.warning(
-                "Something went wrong fetching groups hierarchies: {}".format(
-                    response.status_code))
+                "%s Something went wrong fetching groups hierarchies: %s", response.status_code, response.content)
 
     def get_group_statistics(self, group_id: int) -> dict:
         """Get statistics for the given group.
@@ -101,10 +100,7 @@ def get_group_statistics(self, group_id: int) -> dict:
             return response_data
         else:
             logger.warning(
-                "Something went wrong fetching group statistics: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong fetching group statistics: %s", response.status_code, response.content)
 
     def create_group(
         self, name: str, group_status_id: int, grouptype_id: int, **kwargs
@@ -190,8 +186,7 @@ def update_group(self, group_id: int, data: dict):
             return response_data
         else:
             logger.warning(
-                "Something went wrong updating group: {}".format(
-                    response.status_code))
+                "%s Something went wrong updating group: %s", response.status_code, response.content)
 
     def delete_group(self, group_id: int) -> bool:
         """Delete the given group.
@@ -213,8 +208,7 @@ def delete_group(self, group_id: int) -> bool:
             return True
         else:
             logger.warning(
-                "Something went wrong deleting group: {}".format(response.status_code)
-            )
+                "%s Something went wrong deleting group: %s", response.status_code, response.content)
 
     def get_grouptypes(self, **kwargs):
         """
@@ -243,8 +237,7 @@ def get_grouptypes(self, **kwargs):
             return result
         else:
             logger.warning(
-                "Something went wrong fetching grouptypes: {}".format(
-                    response.status_code))
+                "%s Something went wrong fetching grouptypes: %s", response.status_code, response.content)
 
     def get_group_permissions(self, group_id: int):
         """
@@ -268,8 +261,7 @@ def get_group_permissions(self, group_id: int):
             return response_data
         else:
             logger.warning(
-                "Something went wrong fetching group permissions: {}".format(
-                    response.status_code))
+                "%s Something went wrong fetching group permissions: %s", response.status_code, response.content)
 
     def get_group_members(self, group_id: int, **kwargs) -> list[dict]:
         """Get list of members for the given group.
@@ -305,10 +297,7 @@ def get_group_members(self, group_id: int, **kwargs) -> list[dict]:
             return result_list
         else:
             logger.warning(
-                "Something went wrong fetching group members: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong fetching group members: %s", response.status_code, response.content)
 
     def get_groups_members(
         self, group_ids: list[int] = None, with_deleted: bool = False, **kwargs
@@ -361,10 +350,7 @@ def get_groups_members(
             return result_list
         else:
             logger.warning(
-                "Something went wrong fetching group members: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong fetching group members: %s", response.status_code, response.content)
 
     def add_group_member(self, group_id: int, person_id: int, **kwargs) -> dict:
         """Add a member to a group.
@@ -402,10 +388,7 @@ def add_group_member(self, group_id: int, person_id: int, **kwargs) -> dict:
             return response_data
         else:
             logger.warning(
-                "Something went wrong adding group member: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong adding group member: %s", response.status_code, response.content)
 
     def remove_group_member(self, group_id: int, person_id: int) -> bool:
         """Remove the given group member.
@@ -453,10 +436,7 @@ def get_group_roles(self, group_id: int) -> list[dict]:
             return result_list
         else:
             logger.warning(
-                "Something went wrong fetching group roles: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong fetching group roles: %s", response.status_code, response.content)
 
     def add_parent_group(self, group_id: int, parent_group_id: int) -> bool:
         """Add a parent group for a group.
@@ -504,7 +484,4 @@ def remove_parent_group(self, group_id: int, parent_group_id: int) -> bool:
             return True
         else:
             logger.warning(
-                "Something went wrong removing parent group: {}".format(
-                    response.status_code
-                )
-            )
+                "%s Something went wrong removing parent group: %s", response.status_code, response.content)

churchtools_api/songs.py

@@ -46,8 +46,7 @@ def get_songs(self, **kwargs) -> list[dict]:
                         kwargs["song_id"], response.status_code))
             else:
                 logger.warning(
-                    "Something went wrong fetching songs: CODE {}".format(
-                        response.status_code))
+                    "%s Something went wrong fetching songs: %s", response.status_code, response.content)
 
     def get_song_ajax(self, song_id=None, require_update_after_seconds=10):
         """