From c7eb04e5cd6049c24b347a56f3c80484d329e2bc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 8 Dec 2023 17:22:38 +0100 Subject: [PATCH] Make CmsLog initialisation more robust --- org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java | 10 ++++++++-- sdk/cms-e4-rap.properties | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java index 96a09a91b..3375bcde5 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java @@ -235,7 +235,12 @@ public interface CmsLog { static CmsLog getLog(String name) { if (isSystemLoggerAvailable) { - return new SystemCmsLog(name); + SystemCmsLog systemCmsLog = new SystemCmsLog(name); + if (systemCmsLog.logger == null) { + System.err.println("System logger unexpectedly null for " + name + ", switching to fall back"); + return new FallBackCmsLog(); + } + return systemCmsLog; } else { // typically Android return new FallBackCmsLog(); } @@ -259,10 +264,11 @@ public interface CmsLog { * Java platform. */ class SystemCmsLog implements CmsLog { - private final Logger logger; + final Logger logger; SystemCmsLog(String name) { logger = System.getLogger(name); + assert logger != null : "System logger should not be null"; } @Override diff --git a/sdk/cms-e4-rap.properties b/sdk/cms-e4-rap.properties index b3d4d9269..4fe2113be 100644 --- a/sdk/cms-e4-rap.properties +++ b/sdk/cms-e4-rap.properties @@ -18,10 +18,10 @@ org.argeo.cms.lib.jetty,\ # Local argeo.node.repo.type=h2 -#argeo.http.port=7070 +argeo.http.port=7070 #argeo.http.host=[IP address to listen to] #argeo.https.port=7073 -#argeo.sshd.port=2222 +argeo.sshd.port=2222 # Logging log.org.argeo=DEBUG -- 2.30.2