Skip to content

Commit 15ec845

Browse files
<Vishal> Updated package name and minor changes.
1 parent 36bcd34 commit 15ec845

File tree

6 files changed

+18
-24
lines changed

6 files changed

+18
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DRF API Logger
2-
![version](https://img.shields.io/badge/version-1.1.15-blue.svg)
2+
![version](https://img.shields.io/badge/version-1.1.16-blue.svg)
33
[![Downloads](https://static.pepy.tech/personalized-badge/drf-api-logger?period=total&units=none&left_color=black&right_color=orange&left_text=Downloads%20Total)](http://pepy.tech/project/drf-api-logger)
44
[![Downloads](https://static.pepy.tech/personalized-badge/drf-api-logger?period=month&units=none&left_color=black&right_color=orange&left_text=Downloads%20Last%20Month)](https://pepy.tech/project/drf-api-logger)
55
[![Open Source](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://opensource.org/)

drf_api_logger/admin.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def export_as_csv(self, request, queryset):
2424

2525
writer.writerow(field_names)
2626
for obj in queryset:
27-
row = writer.writerow([getattr(obj, field) for field in field_names])
27+
writer.writerow([getattr(obj, field) for field in field_names])
2828

2929
return response
3030

@@ -39,7 +39,7 @@ class SlowAPIsFilter(admin.SimpleListFilter):
3939
def __init__(self, request, params, model, model_admin):
4040
super().__init__(request, params, model, model_admin)
4141
if hasattr(settings, 'DRF_API_LOGGER_SLOW_API_ABOVE'):
42-
if type(settings.DRF_API_LOGGER_SLOW_API_ABOVE) == int: # Making sure for integer value.
42+
if isinstance(settings.DRF_API_LOGGER_SLOW_API_ABOVE, int): # Making sure for integer value.
4343
self._DRF_API_LOGGER_SLOW_API_ABOVE = settings.DRF_API_LOGGER_SLOW_API_ABOVE / 1000 # Converting to seconds.
4444

4545
def lookups(self, request, model_admin):
@@ -83,10 +83,10 @@ def __init__(self, model, admin_site):
8383
super().__init__(model, admin_site)
8484
self._DRF_API_LOGGER_TIMEDELTA = 0
8585
if hasattr(settings, 'DRF_API_LOGGER_SLOW_API_ABOVE'):
86-
if type(settings.DRF_API_LOGGER_SLOW_API_ABOVE) == int: # Making sure for integer value.
86+
if isinstance(settings.DRF_API_LOGGER_SLOW_API_ABOVE, int): # Making sure for integer value.
8787
self.list_filter += (SlowAPIsFilter,)
8888
if hasattr(settings, 'DRF_API_LOGGER_TIMEDELTA'):
89-
if type(settings.DRF_API_LOGGER_TIMEDELTA) == int: # Making sure for integer value.
89+
if isinstance(settings.DRF_API_LOGGER_TIMEDELTA, int): # Making sure for integer value.
9090
self._DRF_API_LOGGER_TIMEDELTA = settings.DRF_API_LOGGER_TIMEDELTA
9191

9292
def added_on_time(self, obj):
@@ -113,7 +113,7 @@ def changelist_view(self, request, extra_context=None):
113113
response = super(APILogsAdmin, self).changelist_view(request, extra_context)
114114
try:
115115
filtered_query_set = response.context_data["cl"].queryset
116-
except:
116+
except Exception:
117117
return response
118118
analytics_model = filtered_query_set.values('added_on__date').annotate(total=Count('id')).order_by('total')
119119
status_code_count_mode = filtered_query_set.values('id').values('status_code').annotate(

drf_api_logger/events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __init__(self, events=None):
2323

2424
try:
2525
iter(events)
26-
except:
26+
except Exception:
2727
raise AttributeError("type object %s is not iterable" %
2828
(type(events)))
2929
else:

drf_api_logger/middleware/api_logger_middleware.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
from drf_api_logger.start_logger_when_server_starts import LOGGER_THREAD
1414
from drf_api_logger.utils import get_headers, get_client_ip, mask_sensitive_data
1515

16-
"""
17-
File: api_logger_middleware.py
18-
Class: APILoggerMiddleware
19-
"""
20-
2116

2217
class APILoggerMiddleware:
2318
def __init__(self, get_response):
@@ -121,7 +116,7 @@ def __call__(self, request):
121116
Ignore the request body if larger then specified.
122117
"""
123118
request_data = ''
124-
except:
119+
except Exception:
125120
pass
126121

127122
tracing_id = None
@@ -198,14 +193,13 @@ def __call__(self, request):
198193
execution_time=time.time() - start_time,
199194
added_on=timezone.now()
200195
)
201-
if self.DRF_API_LOGGER_DATABASE:
202-
if LOGGER_THREAD:
203-
d = data.copy()
204-
d['headers'] = json.dumps(d['headers'], indent=4, ensure_ascii=False) if d.get('headers') else ''
205-
if request_data:
206-
d['body'] = json.dumps(d['body'], indent=4, ensure_ascii=False) if d.get('body') else ''
207-
d['response'] = json.dumps(d['response'], indent=4, ensure_ascii=False) if d.get('response') else ''
208-
LOGGER_THREAD.put_log_data(data=d)
196+
if self.DRF_API_LOGGER_DATABASE and LOGGER_THREAD:
197+
d = data.copy()
198+
d['headers'] = json.dumps(d['headers'], indent=4, ensure_ascii=False) if d.get('headers') else ''
199+
if request_data:
200+
d['body'] = json.dumps(d['body'], indent=4, ensure_ascii=False) if d.get('body') else ''
201+
d['response'] = json.dumps(d['response'], indent=4, ensure_ascii=False) if d.get('response') else ''
202+
LOGGER_THREAD.put_log_data(data=d)
209203
if self.DRF_API_LOGGER_SIGNAL:
210204
if tracing_id:
211205
data.update({

drf_api_logger/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def get_client_ip(request):
2525
else:
2626
ip = request.META.get('REMOTE_ADDR')
2727
return ip
28-
except:
28+
except Exception:
2929
return ''
3030

3131

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def get_long_desc():
2020

2121

2222
setuptools.setup(
23-
name="drf_api_logger",
24-
version="1.1.15",
23+
name="drf-api-logger",
24+
version="1.1.16",
2525
author="Vishal Anand",
2626
author_email="[email protected]",
2727
description="An API Logger for your Django Rest Framework project.",

0 commit comments

Comments
 (0)