mirror of
https://github.com/MathiasDPX/grainParisArt.git
synced 2025-01-09 08:26:40 +00:00
Add monitoring
This commit is contained in:
parent
8a948cf0b2
commit
0cf51aa2c3
3 changed files with 180 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
||||||
JAWG_API_KEY="Votre clé d'API jawg.io"
|
JAWG_API_KEY="Votre clé d'API jawg.io"
|
||||||
HOST="0.0.0.0"
|
HOST="0.0.0.0"
|
||||||
PORT=5000
|
PORT=5000
|
||||||
|
|
||||||
|
# Monitoring
|
||||||
|
monitoring_enabled=false
|
||||||
|
db_name=name
|
||||||
|
db_host=localhost
|
||||||
|
db_port=5432
|
||||||
|
db_user=user
|
||||||
|
db_password=pwd
|
7
app.py
7
app.py
|
@ -2,6 +2,7 @@ from flask import Flask, render_template, request
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
from os import getenv
|
from os import getenv
|
||||||
|
import monitoring
|
||||||
import html
|
import html
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
@ -81,6 +82,12 @@ def home():
|
||||||
if delta > 6: delta = 6
|
if delta > 6: delta = 6
|
||||||
if delta < 0: delta = 0
|
if delta < 0: delta = 0
|
||||||
|
|
||||||
|
monitoring.log(
|
||||||
|
ip=request.environ.get("HTTP_X_FORWARDED_FOR", request.remote_addr),
|
||||||
|
useragent=request.headers.get('User-Agent'),
|
||||||
|
day=delta
|
||||||
|
)
|
||||||
|
|
||||||
dates = []
|
dates = []
|
||||||
|
|
||||||
for i in range(0, 7):
|
for i in range(0, 7):
|
||||||
|
|
164
monitoring.py
Normal file
164
monitoring.py
Normal file
|
@ -0,0 +1,164 @@
|
||||||
|
import psycopg2
|
||||||
|
from psycopg2 import OperationalError
|
||||||
|
import time
|
||||||
|
from typing import Optional, Any
|
||||||
|
import logging
|
||||||
|
from os import getenv
|
||||||
|
import httpagentparser
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
|
||||||
|
load_dotenv()
|
||||||
|
|
||||||
|
class DatabaseConnector:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
dbname: str,
|
||||||
|
user: str,
|
||||||
|
password: str,
|
||||||
|
host: str = "localhost",
|
||||||
|
port: int = 5432,
|
||||||
|
max_retries: int = 3,
|
||||||
|
retry_delay: int = 5
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Initialize database connector with connection parameters and retry settings.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dbname: Database name
|
||||||
|
user: Database user
|
||||||
|
password: Database password
|
||||||
|
host: Database host
|
||||||
|
port: Database port
|
||||||
|
max_retries: Maximum number of reconnection attempts
|
||||||
|
retry_delay: Delay between retry attempts in seconds
|
||||||
|
"""
|
||||||
|
self.conn_params = {
|
||||||
|
"dbname": dbname,
|
||||||
|
"user": user,
|
||||||
|
"password": password,
|
||||||
|
"host": host,
|
||||||
|
"port": port
|
||||||
|
}
|
||||||
|
self.max_retries = max_retries
|
||||||
|
self.retry_delay = retry_delay
|
||||||
|
self.conn: Optional[psycopg2.extensions.connection] = None
|
||||||
|
self.cur: Optional[psycopg2.extensions.cursor] = None
|
||||||
|
|
||||||
|
# Set up logging
|
||||||
|
logging.basicConfig(
|
||||||
|
level=logging.INFO,
|
||||||
|
format='%(asctime)s - %(levelname)s - %(message)s'
|
||||||
|
)
|
||||||
|
self.logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def connect(self) -> bool:
|
||||||
|
"""
|
||||||
|
Establish database connection.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if connection successful, False otherwise
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
self.conn = psycopg2.connect(**self.conn_params)
|
||||||
|
self.cur = self.conn.cursor()
|
||||||
|
self.logger.info("Successfully connected to the database")
|
||||||
|
return True
|
||||||
|
except OperationalError as e:
|
||||||
|
self.logger.error(f"Error connecting to the database: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def ensure_connection(self) -> bool:
|
||||||
|
"""
|
||||||
|
Ensure database connection is active, attempt to reconnect if necessary.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if connection is active or reconnection successful
|
||||||
|
"""
|
||||||
|
if self.conn and not self.conn.closed:
|
||||||
|
try:
|
||||||
|
# Test connection with simple query
|
||||||
|
self.cur.execute("SELECT 1")
|
||||||
|
return True
|
||||||
|
except (psycopg2.Error, AttributeError):
|
||||||
|
self.logger.warning("Database connection lost")
|
||||||
|
|
||||||
|
# Connection is closed or failed, attempt to reconnect
|
||||||
|
for attempt in range(self.max_retries):
|
||||||
|
self.logger.info(f"Attempting to reconnect (attempt {attempt + 1}/{self.max_retries})")
|
||||||
|
if self.connect():
|
||||||
|
return True
|
||||||
|
time.sleep(self.retry_delay)
|
||||||
|
|
||||||
|
self.logger.error("Failed to reconnect to database after multiple attempts")
|
||||||
|
return False
|
||||||
|
|
||||||
|
def execute_query(self, query: str, params: tuple = None) -> Optional[Any]:
|
||||||
|
"""
|
||||||
|
Execute a database query with automatic reconnection on failure.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
query: SQL query string
|
||||||
|
params: Query parameters (optional)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Query results if successful, None if failed
|
||||||
|
"""
|
||||||
|
if not self.ensure_connection():
|
||||||
|
return None
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.cur.execute(query, params)
|
||||||
|
|
||||||
|
# Check if query is a SELECT statement
|
||||||
|
if query.strip().upper().startswith("SELECT"):
|
||||||
|
results = self.cur.fetchall()
|
||||||
|
self.conn.commit()
|
||||||
|
return results
|
||||||
|
else:
|
||||||
|
self.conn.commit()
|
||||||
|
return True
|
||||||
|
|
||||||
|
except psycopg2.Error as e:
|
||||||
|
self.logger.error(f"Error executing query: {e}")
|
||||||
|
self.conn.rollback()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
"""Close database connection and cursor."""
|
||||||
|
if self.cur:
|
||||||
|
self.cur.close()
|
||||||
|
if self.conn:
|
||||||
|
self.conn.close()
|
||||||
|
self.logger.info("Database connection closed")
|
||||||
|
|
||||||
|
isInit = getenv("monitoring_enabled").lower() == "true"
|
||||||
|
|
||||||
|
if isInit:
|
||||||
|
db = DatabaseConnector(
|
||||||
|
dbname=getenv("db_name"),
|
||||||
|
user=getenv("db_user"),
|
||||||
|
password=getenv("db_password"),
|
||||||
|
host=getenv("db_host"),
|
||||||
|
port=getenv("db_port")
|
||||||
|
)
|
||||||
|
|
||||||
|
db.execute_query("""CREATE TABLE IF NOT EXISTS "cinema_queries" (
|
||||||
|
"ip" VARCHAR(39) NOT NULL,
|
||||||
|
"time" TIMESTAMP NOT NULL,
|
||||||
|
"browser" VARCHAR(255) NULL DEFAULT 'unknown',
|
||||||
|
"os" VARCHAR(255) NULL DEFAULT 'unknown',
|
||||||
|
"day" int NULL DEFAULT 1
|
||||||
|
);
|
||||||
|
""")
|
||||||
|
|
||||||
|
def log(ip:str, useragent:str, day:int) -> bool:
|
||||||
|
if not isInit: return True
|
||||||
|
ua_data = httpagentparser.detect(useragent)
|
||||||
|
os = ua_data.get('os', {}).get("name", "unknown")
|
||||||
|
browser = ua_data.get('browser', {}).get("name", "unknown")
|
||||||
|
success = db.execute_query(f"INSERT INTO cinema_queries (ip, time, browser, os, day) VALUES (\'{ip}\', current_timestamp, \'{browser}\', \'{os}\', {day});")
|
||||||
|
return success
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
ua ="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133.0"
|
||||||
|
print(httpagentparser.detect(ua))
|
Loading…
Reference in a new issue