PAYARA-2384 Changed Cluster Logging to be less verbose (#2270)

payara · Jan 19, 2018 · 4327a88 · 4327a88
1 parent 4b544c7
commit 4327a88
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 11 deletions.
diff --git a/...ras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties b/...ras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
@@ -61,4 +61,5 @@ org.eclipse.persistence.session.level=INFO
 javax.enterprise.system.tools.deployment.dol.level=WARNING
 javax.enterprise.system.tools.deployment.common.level=WARNING
 fish.payara.nucleus.util.level=WARNING
-org.glassfish.admin.mbeanserver.level=WARNING
+org.glassfish.admin.mbeanserver.level=WARNING
+com.hazelcast.level=WARNING
diff --git a/nucleus/admin/template/src/main/resources/config/logging.properties b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -97,3 +97,4 @@ javax.enterprise.resource.sqltrace.level=FINE
 org.jvnet.hk2.osgiadapter.level=INFO
 javax.enterprise.system.ssl.security.level=INFO
 ShoalLogger.level=CONFIG
+com.hazelcast.level=WARNING
diff --git a/...-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/cluster/PayaraCluster.java b/...-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/cluster/PayaraCluster.java
@@ -51,6 +51,7 @@
 import fish.payara.nucleus.store.ClusteredStore;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -69,7 +70,7 @@
 @RunLevel(StartupRunLevel.VAL)
 public class PayaraCluster implements MembershipListener, EventListener {
 
-    private static final Logger logger = Logger.getLogger(ClusteredStore.class.getCanonicalName());
+    private static final Logger logger = Logger.getLogger(PayaraCluster.class.getCanonicalName());
 
     @Inject
     Events events;
@@ -112,16 +113,20 @@ public EventBus getEventBus() {
 
     @Override
     public void memberAdded(MembershipEvent me) {
-        for (ClusterListener myListener : myListeners) {
-            myListener.memberAdded(me.getMember().getUuid());
-        }
+            for (ClusterListener myListener : myListeners) {
+                myListener.memberAdded(me.getMember().getUuid());
+            }
+            logger.log(Level.INFO, "Cluster Member Added {0} at Address {1}", new String[]{me.getMember().getUuid(), me.getMember().getSocketAddress().toString()});
+            logClusterStatus();
     }
 
     @Override
     public void memberRemoved(MembershipEvent me) {
         for (ClusterListener myListener : myListeners) {
             myListener.memberRemoved(me.getMember().getUuid());
         }
+        logger.log(Level.INFO, "Cluster Member Removed {0} from Address {1}", new String []{me.getMember().getUuid(), me.getMember().getSocketAddress().toString()});
+        logClusterStatus();
     }
 
     public String getLocalUUID() {
@@ -218,12 +223,43 @@ void postConstruct() {
     public void event(Event event) {
         if (event.is(HazelcastEvents.HAZELCAST_BOOTSTRAP_COMPLETE)){
             if (hzCore.isEnabled()) {
-                logger.info("Payara Cluster Service Enabled");
+                logger.config("Payara Cluster Service Enabled");
+                logClusterStatus();
                 Cluster cluster = hzCore.getInstance().getCluster();
                 localUUID = cluster.getLocalMember().getUuid();
                 cluster.addMembershipListener(this);
             }          
         }
     }
+
+    private void logClusterStatus() {
+        StringBuilder message = new StringBuilder();
+        String NL = System.lineSeparator();
+        message.append(NL);
+        if (hzCore.isEnabled()) {
+            Cluster cluster = hzCore.getInstance().getCluster();
+            Set<Member> members = hzCore.getInstance().getCluster().getMembers();
+            message.append("Payara Cluster State: Cluster Version: ").append(cluster.getClusterVersion().getId());
+            message.append(" Cluster Size: ").append(members.size());
+            message.append(NL);
+            message.append("Members: {").append(NL);
+            for (Member member : members) {
+
+                message.append("Address: ").append(member.getSocketAddress());
+                message.append(" UUID: ").append(member.getUuid());                message.append(" Lite: ").append(Boolean.toString(member.isLiteMember()));
+                message.append(" This: ").append(Boolean.toString(member.localMember()));
+                String name = member.getStringAttribute(HazelcastCore.INSTANCE_ATTRIBUTE);
+                String group = member.getStringAttribute(HazelcastCore.INSTANCE_GROUP_ATTRIBUTE);
+                if (name != null) {
+                    message.append(" Name: ").append(name);
+                }
+                if (group != null) {
+                    message.append(" Group: ").append(group);
+                }                message.append(NL);
+            }
+            message.append("}");
+            logger.info("Cluster Status " + message);
+        }
+    }
 
 }
diff --git a/...yara-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/eventbus/EventBus.java b/...yara-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/eventbus/EventBus.java
@@ -101,7 +101,7 @@ public void removeMessageReceiver(String topic, MessageReceiver mr) {
     public void event(Event event) {
         if (event.is(HazelcastEvents.HAZELCAST_BOOTSTRAP_COMPLETE)) {
             if (hzCore.isEnabled()) {
-                logger.info("Payara Clustered Event Bus Enabled");
+                logger.config("Payara Clustered Event Bus Enabled");
                 // add message receivers if any as this maybe a
                 for (String topic : messageReceivers.keySet()) {
                     TopicListener tl = messageReceivers.get(topic);

diff --git a/...s/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/exec/ClusterExecutionService.java b/...s/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/exec/ClusterExecutionService.java
@@ -282,7 +282,7 @@ public Map<String, ScheduledTaskFuture<?>> scheduleAtFixedRate(Collection<String
     public void event(Event event) {
         if (event.is(HazelcastEvents.HAZELCAST_BOOTSTRAP_COMPLETE)) {
             if (hzCore.isEnabled()) {
-                logger.info("Payara Clustered Executor Service Enabled");
+                logger.config("Payara Clustered Executor Service Enabled");
             }
         }
     }

diff --git a/...odules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/HazelcastCore.java b/...odules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/HazelcastCore.java
@@ -493,12 +493,12 @@ private synchronized void bootstrapHazelcast() {
             theInstance.getCluster().getLocalMember().setStringAttribute(INSTANCE_ATTRIBUTE, memberName);
             theInstance.getCluster().getLocalMember().setStringAttribute(INSTANCE_GROUP_ATTRIBUTE, memberGroup);
             hazelcastCachingProvider = new CachingProviderProxy(HazelcastServerCachingProvider.createCachingProvider(theInstance), context);
+            bindToJNDI();
             if(env.getStatus() == Status.started) {
                 // only issue this event if the server is already running,
                 // otherwise the SERVER_STARTUP event will issue this event as well
                 events.send(new Event(HazelcastEvents.HAZELCAST_BOOTSTRAP_COMPLETE));
             }
-            bindToJNDI();
             booted = true;
         }
     }

diff --git a/...a-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/store/ClusteredStore.java b/...a-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/store/ClusteredStore.java
@@ -158,7 +158,7 @@ public Serializable get(String storeName, Serializable key) {
     public void event(Event event) {
         if (event.is(HazelcastEvents.HAZELCAST_BOOTSTRAP_COMPLETE)){
             if (hzCore.isEnabled()) {
-                logger.info("Payara Clustered Store Service Enabled");
+                logger.config("Payara Clustered Store Service Enabled");
             }
         }
     }

diff --git a/...a-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/util/CleanupPostBoot.java b/...a-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/util/CleanupPostBoot.java
@@ -81,7 +81,7 @@ public void postConstruct() {
     public void event(Event event) {
 
         if (event.is(EventTypes.SERVER_READY)) {
-            logger.info("Cleaning JarFileFactory Cache to prevent jar FD leaks");
+            logger.config("Cleaning JarFileFactory Cache to prevent jar FD leaks");
         try {
             // Ensure JarFile is closed
             Class clazz = Class.forName("sun.net.www.protocol.jar.JarFileFactory", true, URL.class.getClassLoader());