setu-trafficmonitor 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

{setu_trafficmonitor-2.0.0.dist-info → setu_trafficmonitor-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: setu-trafficmonitor
-Version: 2.0.0
+Version: 2.0.1
 Summary: A comprehensive Django app for logging HTTP requests with analytics dashboard
 Home-page: https://github.com/farmsetu/django-trafficmonitor
 Author: FarmSetu Team

{setu_trafficmonitor-2.0.0.dist-info → setu_trafficmonitor-2.0.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-trafficmonitor/__init__.py,sha256=R33H15TOYxh3ql2Jo9ow4Xo_DoW48cs31ZyN9oN2qxE,277
+trafficmonitor/__init__.py,sha256=WGzUAXFs_lPdm8cGBQa5S4kNZNe35S6Va_u1ZBosbW8,277
 trafficmonitor/admin.py,sha256=yZDeH2jdA0X1RU6TTkYly-3DE7HG3X23d5-rGbxyzcw,6459
 trafficmonitor/apps.py,sha256=pyeGnn-R9mU0jKZGd0FErJWZbURtpt0RO4q87HEsO9A,197
 trafficmonitor/circuit_breaker.py,sha256=zSV8vcBQrQ6_xLb04yFKuo2qtvkogvuD4p2YFY5OIFs,1911
-trafficmonitor/conf.py,sha256=lJfutySfKzhRpuBYN5c_UGqg0EogQ9GhWBZkS6WlNJQ,6164
+trafficmonitor/conf.py,sha256=R9J3iYffTg5AqRp9mJvVLs2TbOfk1dknfH7MrDeuKSI,6377
 trafficmonitor/dashboard_security.py,sha256=6_UAhXWKru3B165Dtgj96VOYQZG1J1Mf1lVYrm-GKWU,4106
 trafficmonitor/db_utils.py,sha256=cS99U-vQqNhphxkuqH4KZq84xbs8vCRGGq45yBRSRkU,1240
 trafficmonitor/exceptions.py,sha256=ZyPjQTpWXNAmtct8xJyFFsaitQBVffVlLx90P-KjzmM,2917
 trafficmonitor/health.py,sha256=oM1rbbbKvkw2PryPTh8bRZ1ODj-1SyRWlv52DnoyWD4,2341
 trafficmonitor/load_test.py,sha256=H8dkDY3w6w8TJ2izyNtUW2Qmk8bLP05Tl7CgLpH3xzA,15078
 trafficmonitor/load_test_api.py,sha256=U1pRK8Gr-zlyP2UUNj6Z0yQx9XbVa0JywIfyYWsWJQc,11344
-trafficmonitor/middleware.py,sha256=3QlN7jM8bdnSnBBiRWhxjdhmX9GzKMxwCXQ4Or6Z7xI,14827
+trafficmonitor/middleware.py,sha256=5CE3u2BbDAHzOpMSIhnL0C8CgvmbugdggtXXAnp8bk4,12386
 trafficmonitor/models.py,sha256=pBMuyIM9vJJzDqWaJUavgP2Djp6-I7YVFba4rNjkjWE,7192
 trafficmonitor/monitoring.py,sha256=NOJ_NUQZ-RDwhOVhhJ1CWx2FhdvfJXc0BkqqzKkCjoQ,3396
 trafficmonitor/permissions.py,sha256=uXLHGCcnhhvAbEAUe2IAMDI3sjIIPbNk-Jogv1diA64,2242
@@ -34,9 +34,9 @@ trafficmonitor/static/analytics/css/dashboard.css,sha256=_H1mlAc9wH3-xlja1HGYw9H
 trafficmonitor/static/analytics/js/dashboard-production.js,sha256=aRGgAEB7SGcZ5wBVj9G4FKwUl-t6GxxsdFDayDRw-6o,10542
 trafficmonitor/static/analytics/js/dashboard-v2.js,sha256=hZO1mUmdZK3YfCYLVX5ToaeWBfN_zPEE_T6e08fMEQM,21880
 trafficmonitor/static/analytics/js/dashboard.js,sha256=t-VfdUi8f2Bil6mIAeI-YmyBg0mMyAt5PigjQ7-I5Eo,20022
-trafficmonitor/templates/analytics/dashboard.html,sha256=O1vZR3oE7_19PSyrQ-GqehGWIDb7FTCcT22x60iYHio,24159
-setu_trafficmonitor-2.0.0.dist-info/LICENSE,sha256=UfMLKswUDNhVdUu-ul480Q3ei7XGfX_9uuAxK7OdWU4,1070
-setu_trafficmonitor-2.0.0.dist-info/METADATA,sha256=nzFDdITkS_2k5SjXqvbjmTabUmPqxE-YDUkIdkTntUA,12979
-setu_trafficmonitor-2.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-setu_trafficmonitor-2.0.0.dist-info/top_level.txt,sha256=81-5rK9eQL1OP2I-aXy5Nd7fw7gHRKYsOfPMN2tVpVE,15
-setu_trafficmonitor-2.0.0.dist-info/RECORD,,
+trafficmonitor/templates/analytics/dashboard.html,sha256=ylCUZsUstmi5MvzjfRkKxXneHKlod-LfgjQmVDOBzvs,24169
+setu_trafficmonitor-2.0.1.dist-info/LICENSE,sha256=UfMLKswUDNhVdUu-ul480Q3ei7XGfX_9uuAxK7OdWU4,1070
+setu_trafficmonitor-2.0.1.dist-info/METADATA,sha256=E98M1mtAPOJRlGDKpSmvReLuq2ho2S9pXsrVuP265yo,12979
+setu_trafficmonitor-2.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+setu_trafficmonitor-2.0.1.dist-info/top_level.txt,sha256=81-5rK9eQL1OP2I-aXy5Nd7fw7gHRKYsOfPMN2tVpVE,15
+setu_trafficmonitor-2.0.1.dist-info/RECORD,,

trafficmonitor/__init__.py

@@ -3,7 +3,7 @@ Django TrafficMonitor
 A comprehensive Django app for logging HTTP requests with analytics dashboard
 """
 
-__version__ = '1.1.0'
+__version__ = '2.0.1'
 __author__ = 'FarmSetu Team'
 __email__ = 'tech@farmsetu.com'
 __license__ = 'MIT'

trafficmonitor/conf.py

@@ -145,7 +145,13 @@ class TrafficMonitorConfig:
         Returns:
             dict: {'user_id': str, 'role': str}
         """
+        # Primary header check (defaults to HTTP_X_USER_ID)
         user_id = request.META.get(f'HTTP_{cls.USER_ID_HEADER.replace("-", "_").upper()}')
+        
+        # Fallback: standard User-Id (HTTP_USER_ID)
+        if not user_id:
+            user_id = request.META.get('HTTP_USER_ID')
+            
         user_role = request.META.get(f'HTTP_{cls.USER_ROLE_HEADER.replace("-", "_").upper()}')
         
         return {

trafficmonitor/middleware.py

@@ -166,66 +166,10 @@ class RequestLoggingMiddleware(MiddlewareMixin):
                 return request._body.decode('utf-8')
             elif hasattr(request, 'body'):
                 return request.body.decode('utf-8')
-        except (UnicodeDecodeError, AttributeError):
-            pass
-        return ""
-
-        try:
-            # Calculate response time
-            response_time_ms = None
-            if hasattr(request, '_logging_start_time'):
-                response_time_ms = (time.time() - request._logging_start_time) * 1000
-
-            # Calculate query count
-            query_count = None
-            if hasattr(request, '_logging_query_count_start'):
-                query_count = len(connection.queries) - request._logging_query_count_start
-
-            # Extract request data
-            request_headers = self._get_request_headers(request)
-            request_body = self._get_request_body(request)
-
-            # Get user ID from header (X-User-ID)
-            requested_user_id = request.META.get('HTTP_X_USER_ID') or request.headers.get('X-User-ID')
-
-            # Get IP address
-            ip_address = self._get_client_ip(request)
-            
-            # Determine operation type and endpoint category
-            operation_type = RequestLog.get_operation_type(request.method)
-            endpoint_category = RequestLog.extract_endpoint_category(request.path)
-            is_api_request = request.path.startswith('/api/')
-
-            # Prepare log data
-            log_data = {
-                'method': request.method,
-                'path': request.path,
-                'full_url': request.build_absolute_uri(),
-                'status_code': response.status_code,
-                'requested_user_id': requested_user_id,
-                'ip_address': ip_address,
-                'user_agent': request.META.get('HTTP_USER_AGENT', ''),
-                'request_headers': request_headers,
-                'request_body': request_body,
-                'operation_type': operation_type,
-                'endpoint_category': endpoint_category,
-                'is_api_request': is_api_request,
-                'response_time_ms': response_time_ms,
-                'query_count': query_count,
-                'content_length': len(response.content) if hasattr(response, 'content') else None,
-            }
-            
-            # Log asynchronously or synchronously based on config
-            if TrafficMonitorConfig.ASYNC_LOGGING:
-                self._log_async(log_data)
-            else:
-                RequestLog.objects.create(**log_data)
-
         except Exception as e:
-            # Log the error but don't break the request/response cycle
-            logger.error(f"Error logging request: {str(e)}", exc_info=True)
+            logger.debug(f"Error extracting request body: {str(e)}")
 
-        return response
+        return None
 
     def process_exception(self, request, exception):
         """

trafficmonitor/templates/analytics/dashboard.html

@@ -123,14 +123,14 @@
                     <label class="block text-sm font-medium text-gray-700 mb-1">Date Range</label>
                     <select name="range" id="rangeSelect"
                         class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500">
-                        <option value="today" {% if selected_range=='today' %}selected{% endif %}>Today</option>
-                        <option value="yesterday" {% if selected_range=='yesterday' %}selected{% endif %}>Yesterday
+                        <option value="today" {% if selected_range == 'today' %}selected{% endif %}>Today</option>
+                        <option value="yesterday" {% if selected_range == 'yesterday' %}selected{% endif %}>Yesterday
                         </option>
-                        <option value="last_7_days" {% if selected_range=='last_7_days' %}selected{% endif %}>Last 7
+                        <option value="last_7_days" {% if selected_range == 'last_7_days' %}selected{% endif %}>Last 7
                             Days</option>
-                        <option value="last_30_days" {% if selected_range=='last_30_days' %}selected{% endif %}>Last 30
+                        <option value="last_30_days" {% if selected_range == 'last_30_days' %}selected{% endif %}>Last 30
                             Days</option>
-                        <option value="custom" {% if selected_range=='custom' %}selected{% endif %}>Custom Range
+                        <option value="custom" {% if selected_range == 'custom' %}selected{% endif %}>Custom Range
                         </option>
                     </select>
                 </div>