APPNG-2477

appNG · Apr 27, 2023 · c6ee03a · c6ee03a
1 parent 936e0f1
commit c6ee03a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/appng-core/src/main/java/org/appng/core/controller/messaging/ReloadSiteEvent.java b/appng-core/src/main/java/org/appng/core/controller/messaging/ReloadSiteEvent.java
@@ -86,7 +86,7 @@ public void waitForClusterState(Environment env, Site site, Logger logger) {
 			String nodeId = Messaging.getNodeId();
 			Map<String, NodeState> nodeStates = NodeEvent.clusterState(env, nodeId);
 			int numNodes = nodeStates.size();
-			int minActiveNodes = (numNodes + 1) / 2;
+			int minActiveNodes = numNodes > 3 ? (numNodes + 1) / 2 : numNodes;
 			int waited = 0;
 			int waitTime = cfg.getInteger("waitForSitesStartedWaitTime", 5);
 			int maxWaittime = cfg.getInteger("waitForSitesStartedMaxWaitTime", 30);

diff --git a/appng-core/src/main/java/org/appng/core/service/InitializerService.java b/appng-core/src/main/java/org/appng/core/service/InitializerService.java
@@ -554,8 +554,12 @@ private synchronized void loadSiteAsync(Environment env, SiteImpl siteToLoad, bo
 				LOGGER.error(error, e);
 			} finally {
 				Messages messages = asyncFp.getMessages();
-				LOGGER.info("Loading site {} finished with {} messages", siteToLoad.getName(),
-						messages.getMessageList().size());
+				int messageCnt = messages.getMessageList().size();
+				LOGGER.info("Loading site {} finished with {} messages", siteToLoad.getName(), messageCnt);
+				if (0 == messageCnt) {
+					asyncFp.addOkMessage(
+							String.format("Site %s has been loaded in the background.", siteToLoad.getName()));
+				}
 				ElementHelper.addMessages(env, messages);
 			}
 		});