From 0103fc96079cd84d6aa2e6f0d290b95a928ab84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Wed, 30 Jul 2025 12:49:21 +0200 Subject: [PATCH 1/3] Fix logging of invalid element (empty log output before) --- src/moin/storage/middleware/indexing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/moin/storage/middleware/indexing.py b/src/moin/storage/middleware/indexing.py index 138fe51fd..d2c0d135d 100644 --- a/src/moin/storage/middleware/indexing.py +++ b/src/moin/storage/middleware/indexing.py @@ -1313,7 +1313,7 @@ def store_revision( val.append(f'"{str(child)}". {str(child.errors[0] if child.errors else "")}') e.valid = False elif e.valid is False: - val.append(str(e)) + val.append(f"{e.name}: {e.raw}") logging.warning(f"{e.valid}, {e.name}, {e.raw}") if VALIDATION_HANDLING == VALIDATION_HANDLING_STRICT: raise ValueError( From e3368a99f0e8e63066935953cc9555b3121885f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Wed, 30 Jul 2025 12:51:00 +0200 Subject: [PATCH 2/3] Simplify code --- src/moin/storage/middleware/indexing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/moin/storage/middleware/indexing.py b/src/moin/storage/middleware/indexing.py index d2c0d135d..9001d308c 100644 --- a/src/moin/storage/middleware/indexing.py +++ b/src/moin/storage/middleware/indexing.py @@ -1309,10 +1309,10 @@ def store_revision( for e in m.children: if e.name in ["itemlinks", "subscriptions"]: for child in e.children: - if child.valid is False: + if not child.valid: val.append(f'"{str(child)}". {str(child.errors[0] if child.errors else "")}') e.valid = False - elif e.valid is False: + elif not e.valid: val.append(f"{e.name}: {e.raw}") logging.warning(f"{e.valid}, {e.name}, {e.raw}") if VALIDATION_HANDLING == VALIDATION_HANDLING_STRICT: From d077468b2c708ae7f592cc2de7980fa7fb172cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Wed, 30 Jul 2025 12:53:20 +0200 Subject: [PATCH 3/3] Log only invalid metadata properties --- src/moin/storage/middleware/indexing.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/moin/storage/middleware/indexing.py b/src/moin/storage/middleware/indexing.py index 9001d308c..4837c1ac0 100644 --- a/src/moin/storage/middleware/indexing.py +++ b/src/moin/storage/middleware/indexing.py @@ -1314,7 +1314,8 @@ def store_revision( e.valid = False elif not e.valid: val.append(f"{e.name}: {e.raw}") - logging.warning(f"{e.valid}, {e.name}, {e.raw}") + if not e.valid: + logging.warning(f"invalid: {e.name}, {e.raw}") if VALIDATION_HANDLING == VALIDATION_HANDLING_STRICT: raise ValueError( _("Error: metadata validation failed, invalid field value(s) = {0}").format(", ".join(val))