chore: reverted system loggin due to memeory issue

Author: codeperfectplus

app.py

@@ -3,7 +3,7 @@
 from src.thread_process import monitor_settings, start_website_monitoring
 
  # background thread to monitor system settings changes
-monitor_settings()  # Starts monitoring for system logging changes
+# monitor_settings()  # Starts monitoring for system logging changes
 start_website_monitoring()  # Starts pinging active websites
 
 if __name__ == "__main__":

src/logger.py

@@ -28,8 +28,8 @@
 logger.addHandler(file_handler)
 
 # Optionally, add console output for real-time debugging (optional)
-console_handler = logging.StreamHandler()
-console_handler.setLevel(logging.INFO)
-console_handler.setFormatter(formatter)
-logger.addHandler(console_handler)
+# console_handler = logging.StreamHandler()
+# console_handler.setLevel(logging.INFO)
+# console_handler.setFormatter(formatter)
+# logger.addHandler(console_handler)
 

src/routes/api.py

@@ -3,6 +3,7 @@
 from src.config import app, db
 from src.models import SystemInformation, UserDashboardSettings
 from src.utils import _get_system_info
+import gc
 
 api_bp = blueprints.Blueprint("api", __name__)
 
@@ -20,66 +21,62 @@ def cpu_percent_api():
 from flask import request
 from datetime import datetime, timedelta
 
-@app.route('/api/graphs_data')
+@app.route('/api/graphs_data', methods=['GET'])
 @login_required
 def graph_data_api():
     try:
-        curent_time = datetime.now()
+        current_time = datetime.now()
         # Get the time filter from query parameters
         time_filter = request.args.get('filter', default='1 day')
-        
+
         # Determine the start time based on the filter
         now = datetime.now()
-        # 5 minutes, 15 minutes, 30 minutes, 1 hour, 3 hours, 6 hours, 12 hours, 1 day, 2 days, 3 days, 1 week, 1 month
-        if time_filter == '5 minutes':
-            start_time = now - timedelta(minutes=5)
-        elif time_filter == '15 minutes':
-            start_time = now - timedelta(minutes=15)
-        elif time_filter == '30 minutes':
-            start_time = now - timedelta(minutes=30)
-        elif time_filter == '1 hour':
-            start_time = now - timedelta(hours=1)
-        elif time_filter == '3 hours':
-            start_time = now - timedelta(hours=3)
-        elif time_filter == '6 hours':
-            start_time = now - timedelta(hours=6)
-        elif time_filter == '12 hours':
-            start_time = now - timedelta(hours=12)
-        elif time_filter == '1 day':
-            start_time = now - timedelta(days=1)
-        elif time_filter == '2 days':
-            start_time = now - timedelta(days=2)
-        elif time_filter == '3 days':
-            start_time = now - timedelta(days=3)
-        elif time_filter == '1 week':
-            start_time = now - timedelta(weeks=1)
-        elif time_filter == '1 month':
-            start_time = now - timedelta(weeks=4)
-        else:
-            start_time = now - timedelta(days=1)  # Default to 1 day if filter is unknown
-
+        time_deltas = {
+            '5 minutes': timedelta(minutes=5),
+            '15 minutes': timedelta(minutes=15),
+            '30 minutes': timedelta(minutes=30),
+            '1 hour': timedelta(hours=1),
+            '3 hours': timedelta(hours=3),
+            '6 hours': timedelta(hours=6),
+            '12 hours': timedelta(hours=12),
+            '1 day': timedelta(days=1),
+            '2 days': timedelta(days=2),
+            '3 days': timedelta(days=3),
+            '1 week': timedelta(weeks=1),
+            '1 month': timedelta(weeks=4)
+        }
+        start_time = now - time_deltas.get(time_filter, timedelta(days=1))
 
         # Fetch entries within the time range
-        recent_system_info_entries = SystemInformation.query.filter(
-            SystemInformation.timestamp >= start_time
-        ).all()
+        query = SystemInformation.query.filter(SystemInformation.timestamp >= start_time)
+        recent_system_info_entries = query.all()
 
-        # Use list comprehension to extract data fields if entries exist, else provide empty lists
+        # Initialize lists for the data
+        time_data = []
+        cpu_data = []
+        memory_data = []
+        battery_data = []
+        network_sent_data = []
+        network_received_data = []
+        dashboard_memory_usage = []
+        cpu_frequency = []
+        current_temp = []
+
+        # Extract data fields if entries exist
         if recent_system_info_entries:
-            time_data, cpu_data, memory_data, battery_data, network_sent_data, network_received_data, \
-            dashboard_memory_usage, cpu_frequency, current_temp = zip(*[
-                (
-                    info.timestamp, info.cpu_percent, info.memory_percent, info.battery_percent,
-                    info.network_sent, info.network_received, info.dashboard_memory_usage,
-                    info.cpu_frequency, info.current_temp
-                )
-                for info in recent_system_info_entries
-            ])
-        else:
-            time_data = cpu_data = memory_data = battery_data = network_sent_data = network_received_data = []
-            dashboard_memory_usage = cpu_frequency = current_temp = []
+            for info in recent_system_info_entries:
+                time_data.append(info.timestamp)
+                cpu_data.append(info.cpu_percent)
+                memory_data.append(info.memory_percent)
+                battery_data.append(info.battery_percent)
+                network_sent_data.append(info.network_sent)
+                network_received_data.append(info.network_received)
+                dashboard_memory_usage.append(info.dashboard_memory_usage)
+                cpu_frequency.append(info.cpu_frequency)
+                current_temp.append(info.current_temp)
+
         # Return the data as JSON
-        return jsonify({
+        response = jsonify({
             "time": time_data,
             "cpu": cpu_data,
             "memory": memory_data,
@@ -89,8 +86,24 @@ def graph_data_api():
             "dashboard_memory_usage": dashboard_memory_usage,
             "cpu_frequency": cpu_frequency,
             "current_temp": current_temp,
-            "current_time": curent_time
-        }), 200
+            "current_time": current_time
+        })
+
+        # Clean up large data structures
+        del recent_system_info_entries
+        del time_data
+        del cpu_data
+        del memory_data
+        del battery_data
+        del network_sent_data
+        del network_received_data
+        del dashboard_memory_usage
+        del cpu_frequency
+        del current_temp
+
+        gc.collect()
+
+        return response, 200
     except Exception as e:
         # Handle and log the error for debugging purposes
         return jsonify({'error': 'An error occurred while fetching the graph data', 'details': str(e)}), 500

src/static/css/time_filter.css

@@ -0,0 +1,25 @@
+/* Container for the select input */
+.selector-container {
+    display: flex;            /* Use flexbox for alignment */
+    justify-content: flex-end; /* Align items to the right */
+    padding: 10px;            /* Add some padding for spacing */
+}
+
+/* Styling the select input */
+#timeFilter {
+    padding: 5px 8px;         /* Adjust padding for a smaller look */
+    font-size: 14px;          /* Smaller font size */
+    border-radius: 4px;       /* Rounded corners */
+    border: 1px solid #ccc;   /* Light border */
+    outline: none;            /* Remove default focus outline */
+    background-color: #fff;   /* White background */
+    cursor: pointer;          /* Pointer cursor for better UX */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Subtle shadow */
+    transition: border-color 0.3s ease, box-shadow 0.3s ease; /* Smooth transition */
+}
+
+/* Hover and focus styles for better interactivity */
+#timeFilter:hover, #timeFilter:focus {
+    border-color: #007bff;    /* Border color change on hover */
+    box-shadow: 0 2px 8px rgba(0, 123, 255, 0.2); /* More pronounced shadow */
+}

src/static/js/graphs.js

@@ -78,26 +78,11 @@ function formatDate(dateString, currentTime) {
 }
 
 function displayTimeAndTimeZone(currentTime, timeZoneName) {
-    // Update current time and timezone
-    function updateTime() {
-        const options = { hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZoneName };
-        now = new Date();
-        const timeString = now.toLocaleTimeString('en-US', options);
-
-        // Display the current time and timezone
-        document.getElementById('currentTime').textContent = `Current Time: ${timeString}`;
-        document.getElementById('timeZoneName').textContent = `Time Zone: ${timeZoneName}`;
-    }
-
-    // Initial display
-    updateTime();
-    
-    // Update time every second
-    setInterval(updateTime, 1000);
+    // Display the current time and timezone
+    document.getElementById('currentTime').textContent = `Current Time: ${currentTime}`;
+    document.getElementById('timeZoneName').textContent = `Time Zone: ${timeZoneName}`;
 }
 
-// Display current time and time zone
-
 
 // Function to create a chart with multiple datasets
 function createChart(ctx, labels, datasets, yLabel) {

src/templates/graphs.html

@@ -11,7 +11,6 @@
 {% block content %}
 <div class="col">
     <div class="row selector-container">
-        {% include 'card_comp/selector/refresh_button.html' %}
         <div class="time-filter-container">
             <label for="timeFilter">Select Time Filter:</label>
             <select id="timeFilter">
@@ -78,5 +77,4 @@ <h2><i class="fas fa-thermometer-half"></i> Current Temperature Over Time</h2>
 {% endblock %}
 {% block extra_scripts %}
 <script src="{{ url_for('static', filename='js/graphs.js')}}"></script>
-<script src="{{ url_for('static', filename='js/refresh_page.js')}}"></script>
 {% endblock %}