From dd97b6a4b71fc2612feeb07fabd7872b6d91d50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20S=C5=82ota?= <bartlomiej.slota@gmail.com>
Date: Fri, 7 Oct 2016 00:11:24 +0200
Subject: [PATCH] #1376 Register and cancel event sending fix

---
 .../eureka/server/InstanceRegistry.java       | 66 ++++++++++++++-----
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
index 05c5676f..fe2090f6 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.netflix.eureka.server;
 
 import java.util.List;
 
+import com.netflix.eureka.lease.Lease;
 import org.springframework.beans.BeansException;
 import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCanceledEvent;
 import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRegisteredEvent;
@@ -78,27 +79,23 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl
 
 	@Override
 	public void register(InstanceInfo info, int leaseDuration, boolean isReplication) {
-		if (log.isDebugEnabled()) {
-			log.debug("register " + info.getAppName() + ", vip " + info.getVIPAddress()
-					+ ", leaseDuration " + leaseDuration + ", isReplication "
-					+ isReplication);
-		}
-		// TODO: what to publish from info (whole object?)
-		this.ctxt.publishEvent(new EurekaInstanceRegisteredEvent(this, info,
-				leaseDuration, isReplication));
-
+		logRegistration(info, isReplication, leaseDuration);
+		publishEurekaInstanceRegisteredEvent(info, leaseDuration, isReplication);
 		super.register(info, leaseDuration, isReplication);
 	}
 
 	@Override
-	public boolean cancel(String appName, String serverId, boolean isReplication) {
-		if (log.isDebugEnabled()) {
-			log.debug("cancel " + appName + " serverId " + serverId + ", isReplication {}"
-					+ isReplication);
-		}
-		this.ctxt.publishEvent(
-				new EurekaInstanceCanceledEvent(this, appName, serverId, isReplication));
+	public void register(final InstanceInfo info, final boolean isReplication) {
+		final int instanceLeaseDuration = resolveInstanceLeaseDuration(info);
+		logRegistration(info, isReplication, instanceLeaseDuration);
+		publishEurekaInstanceRegisteredEvent(info, instanceLeaseDuration, isReplication);
+		super.register(info, isReplication);
+	}
 
+	@Override
+	public boolean cancel(String appName, String serverId, boolean isReplication) {
+		logCancelation(appName, serverId, isReplication);
+		publishEurekaInstanceCanceledEvent(appName, serverId, isReplication);
 		return super.cancel(appName, serverId, isReplication);
 	}
 
@@ -126,4 +123,41 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl
 		}
 		return super.renew(appName, serverId, isReplication);
 	}
+
+	@Override
+	protected boolean internalCancel(String appName, String id, boolean isReplication) {
+		logCancelation(appName, id, isReplication);
+		publishEurekaInstanceCanceledEvent(appName, id, isReplication);
+		return super.internalCancel(appName, id, isReplication);
+	}
+
+	private void logRegistration(InstanceInfo info, boolean isReplication, int instanceLeaseDuration) {
+		if (log.isDebugEnabled()) {
+      log.debug("register " + info.getAppName() + ", vip " + info.getVIPAddress()
+          + ", leaseDuration " + instanceLeaseDuration + ", isReplication " + isReplication);
+		}
+	}
+
+	private void logCancelation(String appName, String serverId, boolean isReplication) {
+		if (log.isDebugEnabled()) {
+			log.debug("cancel " + appName + " serverId " + serverId + ", isReplication " + isReplication);
+		}
+	}
+
+	private void publishEurekaInstanceRegisteredEvent(InstanceInfo info, int leaseDuration, boolean isReplication) {
+		// TODO: what to publish from info (whole object?)
+		this.ctxt.publishEvent(new EurekaInstanceRegisteredEvent(this, info, leaseDuration, isReplication));
+	}
+
+	private void publishEurekaInstanceCanceledEvent(String appName, String serverId, boolean isReplication) {
+		this.ctxt.publishEvent(new EurekaInstanceCanceledEvent(this, appName, serverId, isReplication));
+	}
+
+	private int resolveInstanceLeaseDuration(final InstanceInfo info) {
+		int leaseDuration = Lease.DEFAULT_DURATION_IN_SECS;
+		if (info.getLeaseInfo() != null && info.getLeaseInfo().getDurationInSecs() > 0) {
+			leaseDuration = info.getLeaseInfo().getDurationInSecs();
+		}
+		return leaseDuration;
+	}
 }