PAYARA-1809 Payara Micro Eventbus uses hazelcast instance name (#1753)

payara · Jul 7, 2017 · b9fbf3d · b9fbf3d
1 parent 138238a
commit b9fbf3d
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/...rc/main/java/fish/payara/notification/eventbus/core/EventbusNotificationEventFactory.java b/...rc/main/java/fish/payara/notification/eventbus/core/EventbusNotificationEventFactory.java
@@ -39,6 +39,7 @@
  */
 package fish.payara.notification.eventbus.core;
 
+import fish.payara.nucleus.hazelcast.HazelcastCore;
 import fish.payara.nucleus.notification.configuration.NotifierType;
 import fish.payara.nucleus.notification.domain.NotificationEventFactory;
 import org.glassfish.api.StartupRunLevel;
@@ -48,6 +49,9 @@
 import javax.annotation.PostConstruct;
 import java.text.MessageFormat;
 import java.util.logging.Level;
+import javax.inject.Inject;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.hk2.api.ServiceLocator;
 
 /**
  * @author mertcaliskan
@@ -56,15 +60,28 @@
 @RunLevel(StartupRunLevel.VAL)
 public class EventbusNotificationEventFactory extends NotificationEventFactory<EventbusNotificationEvent> {
 
+    @Inject
+    private ServerEnvironment environment;
+
+    @Inject
+    private ServiceLocator habitat;
+
+    @Inject
+    HazelcastCore hazelcast;
+
     @PostConstruct
     void postConstruct() {
         registerEventFactory(NotifierType.EVENTBUS, this);
     }
 
+    @Override
     public EventbusNotificationEvent buildNotificationEvent(String subject, String message) {
         EventbusNotificationEvent event = initializeEvent(new EventbusNotificationEvent());
         event.setSubject(subject);
         event.setMessage(message);
+        if (environment.isMicro()){
+            setHazelcastAsInstanceName(event);
+        }
 
         return event;
     }
@@ -77,6 +94,19 @@ public EventbusNotificationEvent buildNotificationEvent(Level level, String subj
             message = MessageFormat.format(message, parameters);
         }
         event.setMessage(message);
+        if (environment.isMicro()){
+            setHazelcastAsInstanceName(event);
+        }
         return event;
     }
+
+    /**
+     * If this is a Micro instance, use Hazelcast instance name instead of the payara instance name so we get a unique result
+     * @param e 
+     */
+    private void setHazelcastAsInstanceName(EventbusNotificationEvent e){
+        e.setInstanceName(hazelcast.getMemberName());
+
+    }
+
 }