test

logger.py

@@ -1,41 +1,56 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 import psutil
 import time
+import subprocess
+import asyncio
 
 app = FastAPI()
 
-# Endpoint to get system health
-@app.get("/health")
-async def get_system_health():
+# Function to ping google.com
+def ping_google():
+    result = subprocess.run(['ping', '-c', '4', 'google.com'], capture_output=True, text=True)
+    return result.stdout
+
+# Endpoint to get system health, stats, and ping
+@app.get("/")
+async def root(request: Request):
+    start_time = time.time()  # Start measuring time
+    # System health
     cpu_percent = psutil.cpu_percent()
     memory_percent = psutil.virtual_memory().percent
     disk_percent = psutil.disk_usage('/').percent
-    return {
-        "cpu_percent": cpu_percent,
-        "memory_percent": memory_percent,
-        "disk_percent": disk_percent
-    }
-
-# Endpoint to get server stats
-start_time = time.time()
 
-@app.get("/stats")
-async def get_server_stats():
-    uptime_seconds = time.time() - start_time
+    # Server stats
+    uptime_seconds = time.time() - app.state.start_time
     uptime_minutes = uptime_seconds / 60
+
+    # Ping
+    ping_result = ping_google()
+
+    # Calculate ping latency
+    end_time = time.time()
+    ping_latency = (end_time - start_time) * 1000  # Convert to milliseconds
+
     return {
-        "uptime_seconds": uptime_seconds,
-        "uptime_minutes": uptime_minutes,
-        # You can add more stats here like number of requests served, etc.
+        "system_health": {
+            "cpu_percent": cpu_percent,
+            "memory_percent": memory_percent,
+            "disk_percent": disk_percent
+        },
+        "server_stats": {
+            "uptime_seconds": uptime_seconds,
+            "uptime_minutes": uptime_minutes
+            # Add more stats here if needed
+        },
+        "ping": {
+            "status": ping_result,
+            "latency_ms": ping_latency
+        }
     }
 
-# Ping endpoint
-@app.get("/ping")
-async def ping():
-    return {"ping": "pong"}
-
-# Root endpoint
-@app.get("/")
-async def read_root():
-    return {"PyDVPL DISCORD BOT DOCKER"}
+# Define startup event handler
+async def startup_event():
+    app.state.start_time = time.time()  # Initialize server start time
 
+# Register the startup event handler using add_event_handler
+app.add_event_handler("startup", startup_event)