chore: prevent null message logging + log cleanup [DHIS2-17998] (#19800)

dhis2 · Jan 29, 2025 · d5533d2 · d5533d2
1 parent 83a66bd
commit d5533d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 149 deletions.
diff --git a/.../dhis-support-system/src/main/java/org/hisp/dhis/system/notification/DefaultNotifier.java b/.../dhis-support-system/src/main/java/org/hisp/dhis/system/notification/DefaultNotifier.java
@@ -161,7 +161,18 @@ private void asyncPushToStore(UID job, Notification n) {
       }
     }
     list.add(n);
-    NotificationLoggerUtil.log(log, n.getLevel(), n.getMessage());
+    logNotificationAdded(n);
+  }
+
+  private static void logNotificationAdded(Notification n) {
+    String message = n.getMessage();
+    if (message == null || message.isEmpty()) return;
+    switch (n.getLevel()) {
+      case LOOP, DEBUG -> log.debug(message);
+      case INFO -> log.info(message);
+      case WARN -> log.warn(message);
+      case ERROR -> log.error(message);
+    }
   }
 
   private void asyncAutomaticCleanup() {

diff --git a/...upport-system/src/main/java/org/hisp/dhis/system/notification/NotificationLoggerUtil.java b/...upport-system/src/main/java/org/hisp/dhis/system/notification/NotificationLoggerUtil.java
diff --git a/...rt-system/src/test/java/org/hisp/dhis/system/notification/NotificationLoggerUtilTest.java b/...rt-system/src/test/java/org/hisp/dhis/system/notification/NotificationLoggerUtilTest.java