infra-2026-10-045: WatchedRotatingFileHandler resistant au remplacement d inode
This commit is contained in:
1 parent
67f33fc81e
commit
a152e5a33f
2 files changed
+109
-2
No files matched your search
@@ -15,6 +15,7 @@ import logging.handlers
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
import stat
|
||||||
import sys
|
import sys
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
@@ -42,13 +43,69 @@ RATE_LIMIT_ASK_PER_MIN = int(os.environ.get("RATE_LIMIT_ASK_PER_MIN", "10"))
|
|||||||
TIMEOUT_SECONDS = float(os.environ.get("TIMEOUT_SECONDS", "60.0"))
|
TIMEOUT_SECONDS = float(os.environ.get("TIMEOUT_SECONDS", "60.0"))
|
||||||
RETRY_DELAY_SECONDS = float(os.environ.get("RETRY_DELAY_SECONDS", "2.0"))
|
RETRY_DELAY_SECONDS = float(os.environ.get("RETRY_DELAY_SECONDS", "2.0"))
|
||||||
|
|
||||||
|
class WatchedRotatingFileHandler(logging.handlers.RotatingFileHandler):
|
||||||
|
"""Sous-classe de RotatingFileHandler qui surveille le couple (périphérique, inode)
|
||||||
|
et rouvre le fichier s'il a changé ou disparu avant chaque écriture (comportement
|
||||||
|
de WatchedFileHandler avec conservation de la rotation maxBytes et backupCount).
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
|
||||||
|
encoding=None, delay=False, errors=None):
|
||||||
|
super().__init__(filename, mode=mode, maxBytes=maxBytes,
|
||||||
|
backupCount=backupCount, encoding=encoding,
|
||||||
|
delay=delay, errors=errors)
|
||||||
|
self.dev, self.ino = -1, -1
|
||||||
|
self._statstream()
|
||||||
|
|
||||||
|
def _statstream(self):
|
||||||
|
if self.stream:
|
||||||
|
try:
|
||||||
|
sres = os.fstat(self.stream.fileno())
|
||||||
|
self.dev, self.ino = sres[stat.ST_DEV], sres[stat.ST_INO]
|
||||||
|
except Exception:
|
||||||
|
self.dev, self.ino = -1, -1
|
||||||
|
|
||||||
|
def reopen_if_needed(self):
|
||||||
|
try:
|
||||||
|
sres = os.stat(self.baseFilename)
|
||||||
|
except OSError:
|
||||||
|
sres = None
|
||||||
|
if not sres or sres[stat.ST_DEV] != self.dev or sres[stat.ST_INO] != self.ino:
|
||||||
|
if self.stream is not None:
|
||||||
|
try:
|
||||||
|
self.stream.flush()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
self.stream.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
self.stream = None
|
||||||
|
try:
|
||||||
|
os.makedirs(os.path.dirname(os.path.abspath(self.baseFilename)), exist_ok=True)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
self.stream = self._open()
|
||||||
|
self._statstream()
|
||||||
|
|
||||||
|
def emit(self, record):
|
||||||
|
try:
|
||||||
|
self.reopen_if_needed()
|
||||||
|
if self.shouldRollover(record):
|
||||||
|
self.doRollover()
|
||||||
|
self._statstream()
|
||||||
|
logging.FileHandler.emit(self, record)
|
||||||
|
except Exception:
|
||||||
|
self.handleError(record)
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------- Journalisation des accès
|
# ---------------------------------------------------------------- Journalisation des accès
|
||||||
os.makedirs(LOGS_DIR, exist_ok=True)
|
os.makedirs(LOGS_DIR, exist_ok=True)
|
||||||
access_logger = logging.getLogger("notebook_mcp.access")
|
access_logger = logging.getLogger("notebook_mcp.access")
|
||||||
access_logger.setLevel(logging.INFO)
|
access_logger.setLevel(logging.INFO)
|
||||||
access_logger.propagate = False
|
access_logger.propagate = False
|
||||||
if not access_logger.handlers:
|
if not access_logger.handlers:
|
||||||
rfh = logging.handlers.RotatingFileHandler(
|
rfh = WatchedRotatingFileHandler(
|
||||||
ACCESS_LOG_PATH,
|
ACCESS_LOG_PATH,
|
||||||
maxBytes=5 * 1024 * 1024,
|
maxBytes=5 * 1024 * 1024,
|
||||||
backupCount=3,
|
backupCount=3,
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class TestNotebookMcp(unittest.IsolatedAsyncioTestCase):
|
|||||||
|
|
||||||
# Reconfigure logger
|
# Reconfigure logger
|
||||||
server.access_logger.handlers.clear()
|
server.access_logger.handlers.clear()
|
||||||
rfh = server.logging.handlers.RotatingFileHandler(
|
rfh = server.WatchedRotatingFileHandler(
|
||||||
self.access_log_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding="utf-8"
|
self.access_log_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding="utf-8"
|
||||||
)
|
)
|
||||||
rfh.setFormatter(server.logging.Formatter("%(message)s"))
|
rfh.setFormatter(server.logging.Formatter("%(message)s"))
|
||||||
@@ -65,6 +65,8 @@ class TestNotebookMcp(unittest.IsolatedAsyncioTestCase):
|
|||||||
server.init_db()
|
server.init_db()
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
|
for h in list(server.access_logger.handlers):
|
||||||
|
h.close()
|
||||||
server.access_logger.handlers.clear()
|
server.access_logger.handlers.clear()
|
||||||
self.temp_dir.cleanup()
|
self.temp_dir.cleanup()
|
||||||
|
|
||||||
@@ -324,5 +326,53 @@ class TestNotebookMcp(unittest.IsolatedAsyncioTestCase):
|
|||||||
self.assertIn("502", str(ctx.exception))
|
self.assertIn("502", str(ctx.exception))
|
||||||
|
|
||||||
|
|
||||||
|
def test_journal_resiste_renommage_suppression_remplacement(self):
|
||||||
|
"""Vérifie que le journal résiste au renommage, suppression et remplacement (nouvel inode)."""
|
||||||
|
# Écriture initiale
|
||||||
|
server.log_access("test-pilote", "notebook_list", None, "ok", 10)
|
||||||
|
self.assertTrue(os.path.exists(self.access_log_path))
|
||||||
|
with open(self.access_log_path, "r", encoding="utf-8") as f:
|
||||||
|
content1 = f.read()
|
||||||
|
self.assertIn("identity=test-pilote", content1)
|
||||||
|
self.assertIn("tool=notebook_list", content1)
|
||||||
|
|
||||||
|
# 1. Renommage : le fichier d'origine est déplacé
|
||||||
|
moved = self.access_log_path + ".verif_renomme"
|
||||||
|
os.rename(self.access_log_path, moved)
|
||||||
|
self.assertFalse(os.path.exists(self.access_log_path))
|
||||||
|
|
||||||
|
# Écriture suivante -> nouveau fichier créé avec la nouvelle ligne
|
||||||
|
server.log_access("test-pilote", "notebook_get", "notebook:1", "ok", 15)
|
||||||
|
self.assertTrue(os.path.exists(self.access_log_path))
|
||||||
|
with open(self.access_log_path, "r", encoding="utf-8") as f:
|
||||||
|
content2 = f.read()
|
||||||
|
self.assertIn("tool=notebook_get", content2)
|
||||||
|
self.assertNotIn("tool=notebook_list", content2)
|
||||||
|
|
||||||
|
# 2. Suppression : le fichier est supprimé
|
||||||
|
os.remove(self.access_log_path)
|
||||||
|
self.assertFalse(os.path.exists(self.access_log_path))
|
||||||
|
|
||||||
|
# Écriture suivante -> nouveau fichier créé avec la nouvelle ligne
|
||||||
|
server.log_access("test-pilote", "notebook_ask", "notebook:1", "ok", 20)
|
||||||
|
self.assertTrue(os.path.exists(self.access_log_path))
|
||||||
|
with open(self.access_log_path, "r", encoding="utf-8") as f:
|
||||||
|
content3 = f.read()
|
||||||
|
self.assertIn("tool=notebook_ask", content3)
|
||||||
|
|
||||||
|
# 3. Remplacement : remplacement par un fichier avec un autre inode (os.replace)
|
||||||
|
replaced = self.access_log_path + ".verif_replace"
|
||||||
|
with open(replaced, "w", encoding="utf-8") as f:
|
||||||
|
f.write("2026-10-12T00:00:00Z | identity=autre | ligne_externe\n")
|
||||||
|
os.replace(replaced, self.access_log_path)
|
||||||
|
|
||||||
|
# Écriture suivante -> détection du changement d'inode et réouverture
|
||||||
|
server.log_access("test-pilote", "source_list", "notebook:1", "ok", 5)
|
||||||
|
with open(self.access_log_path, "r", encoding="utf-8") as f:
|
||||||
|
content4 = f.read()
|
||||||
|
self.assertIn("ligne_externe", content4)
|
||||||
|
self.assertIn("tool=source_list", content4)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
Reference in new issue
Block a user