Skip to content

Commit

Permalink
Handle better SendFailedException in client RegistrationEngine
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbernard31
sbernard31 committed Aug 16, 2018
1 parent ad6fe62 commit b463fcf
Showing 1 changed file with 108 additions and 74 deletions.
182 changes: 108 additions & 74 deletions leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/RegistrationEngine.java
View file
Expand Up @@ -36,6 +36,7 @@
import org.eclipse.leshan.core.request.Identity;
import org.eclipse.leshan.core.request.RegisterRequest;
import org.eclipse.leshan.core.request.UpdateRequest;
import org.eclipse.leshan.core.request.exception.SendFailedException;
import org.eclipse.leshan.core.response.BootstrapResponse;
import org.eclipse.leshan.core.response.DeregisterResponse;
import org.eclipse.leshan.core.response.RegisterResponse;
Expand Down Expand Up @@ -189,6 +190,9 @@ private Collection<Server> clientInitiatedBootstrap() throws InterruptedExceptio
}
return null;
}
} catch (SendFailedException e) {
logExceptionOnSendRequest("Unable to send Bootstrap request", e);
return null;
} finally {
bootstrapHandler.closeSession();
}
Expand All @@ -208,34 +212,40 @@ private boolean register(Server server) throws InterruptedException {

// Send register request
LOG.info("Trying to register to {} ...", dmInfo.getFullUri());
RegisterRequest regRequest = new RegisterRequest(endpoint, dmInfo.lifetime, LwM2m.VERSION, dmInfo.binding, null,
LinkFormatHelper.getClientDescription(objectEnablers.values(), null), additionalAttributes);
RegisterResponse response = sender.send(server.getIdentity().getPeerAddress(), server.getIdentity().isSecure(),
regRequest, DEFAULT_TIMEOUT);
if (response == null) {
LOG.error("Registration failed: Timeout.");
if (observer != null) {
observer.onRegistrationTimeout(server);
}
} else if (response.isSuccess()) {
// Add server to registered one
String registrationID = response.getRegistrationID();
registeredServers.put(registrationID, server);
LOG.info("Registered with location '{}'.", registrationID);

// Update every lifetime period
long delay = calculateNextUpdate(dmInfo.lifetime);
scheduleUpdate(server, registrationID, delay);

if (observer != null) {
observer.onRegistrationSuccess(server, registrationID);
}
return true;
} else {
LOG.error("Registration failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onRegistrationFailure(server, response.getCode(), response.getErrorMessage());
try {
RegisterRequest regRequest = new RegisterRequest(endpoint, dmInfo.lifetime, LwM2m.VERSION, dmInfo.binding,
null, LinkFormatHelper.getClientDescription(objectEnablers.values(), null), additionalAttributes);
RegisterResponse response = sender.send(server.getIdentity().getPeerAddress(),
server.getIdentity().isSecure(), regRequest, DEFAULT_TIMEOUT);

if (response == null) {
LOG.error("Registration failed: Timeout.");
if (observer != null) {
observer.onRegistrationTimeout(server);
}
} else if (response.isSuccess()) {
// Add server to registered one
String registrationID = response.getRegistrationID();
registeredServers.put(registrationID, server);
LOG.info("Registered with location '{}'.", registrationID);

// Update every lifetime period
long delay = calculateNextUpdate(dmInfo.lifetime);
scheduleUpdate(server, registrationID, delay);

if (observer != null) {
observer.onRegistrationSuccess(server, registrationID);
}
return true;
} else {
LOG.error("Registration failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onRegistrationFailure(server, response.getCode(), response.getErrorMessage());
}
}
} catch (SendFailedException e) {
logExceptionOnSendRequest("Unable to send register request", e);
return false;
}
return false;
}
Expand All @@ -252,33 +262,38 @@ private boolean deregister(Server server, String registrationID) throws Interrup

// Send deregister request
LOG.info("Trying to deregister to {} ...", dmInfo.getFullUri());
DeregisterResponse response = sender.send(server.getIdentity().getPeerAddress(),
server.getIdentity().isSecure(), new DeregisterRequest(registrationID), DEREGISTRATION_TIMEOUT);
if (response == null) {
registrationID = null;
LOG.error("Deregistration failed: Timeout.");
if (observer != null) {
observer.onDeregistrationTimeout(server);
}
return false;
} else if (response.isSuccess() || response.getCode() == ResponseCode.NOT_FOUND) {
registeredServers.remove(registrationID);
registrationID = null;
cancelUpdateTask(true);
LOG.info("De-register response {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
if (response.isSuccess()) {
observer.onDeregistrationSuccess(server, registrationID);
} else {
try {
DeregisterResponse response = sender.send(server.getIdentity().getPeerAddress(),
server.getIdentity().isSecure(), new DeregisterRequest(registrationID), DEREGISTRATION_TIMEOUT);
if (response == null) {
registrationID = null;
LOG.error("Deregistration failed: Timeout.");
if (observer != null) {
observer.onDeregistrationTimeout(server);
}
return false;
} else if (response.isSuccess() || response.getCode() == ResponseCode.NOT_FOUND) {
registeredServers.remove(registrationID);
registrationID = null;
cancelUpdateTask(true);
LOG.info("De-register response {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
if (response.isSuccess()) {
observer.onDeregistrationSuccess(server, registrationID);
} else {
observer.onDeregistrationFailure(server, response.getCode(), response.getErrorMessage());
}
}
return true;
} else {
LOG.error("Deregistration failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onDeregistrationFailure(server, response.getCode(), response.getErrorMessage());
}
return false;
}
return true;
} else {
LOG.error("Deregistration failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onDeregistrationFailure(server, response.getCode(), response.getErrorMessage());
}
} catch (SendFailedException e) {
logExceptionOnSendRequest("Unable to send deregister request", e);
return false;
}
}
Expand All @@ -292,30 +307,35 @@ private boolean update(Server server, String registrationID) throws InterruptedE

// Send update
LOG.info("Trying to update registration to {} ...", dmInfo.getFullUri());
UpdateResponse response = sender.send(dmInfo.getAddress(), dmInfo.isSecure(),
new UpdateRequest(registrationID, null, null, null, null, null), DEFAULT_TIMEOUT);
if (response == null) {
registrationID = null;
LOG.error("Registration update failed: Timeout.");
if (observer != null) {
observer.onUpdateTimeout(server);
}
return false;
} else if (response.getCode() == ResponseCode.CHANGED) {
// Update successful, so we reschedule new update
LOG.info("Registration update succeed.");
long delay = calculateNextUpdate(dmInfo.lifetime);
scheduleUpdate(server, registrationID, delay);
if (observer != null) {
observer.onUpdateSuccess(server, registrationID);
}
return true;
} else {
LOG.error("Registration update failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onUpdateFailure(server, response.getCode(), response.getErrorMessage());
try {
UpdateResponse response = sender.send(dmInfo.getAddress(), dmInfo.isSecure(),
new UpdateRequest(registrationID, null, null, null, null, null), DEFAULT_TIMEOUT);
if (response == null) {
registrationID = null;
LOG.error("Registration update failed: Timeout.");
if (observer != null) {
observer.onUpdateTimeout(server);
}
return false;
} else if (response.getCode() == ResponseCode.CHANGED) {
// Update successful, so we reschedule new update
LOG.info("Registration update succeed.");
long delay = calculateNextUpdate(dmInfo.lifetime);
scheduleUpdate(server, registrationID, delay);
if (observer != null) {
observer.onUpdateSuccess(server, registrationID);
}
return true;
} else {
LOG.error("Registration update failed: {} {}.", response.getCode(), response.getErrorMessage());
if (observer != null) {
observer.onUpdateFailure(server, response.getCode(), response.getErrorMessage());
}
registeredServers.remove(registrationID);
return false;
}
registeredServers.remove(registrationID);
} catch (SendFailedException e) {
logExceptionOnSendRequest("Unable to send update request", e);
return false;
}
}
Expand Down Expand Up @@ -524,6 +544,20 @@ public void triggerRegistrationUpdate() {
}
}

private void logExceptionOnSendRequest(String message, Exception e) {
if (LOG.isDebugEnabled()) {
LOG.warn(message, e);
return;
}
if (e instanceof SendFailedException) {
if (e.getCause() != null && e.getMessage() != null) {
LOG.warn("{} : {}", message, e.getCause().getMessage());
return;
}
}
LOG.warn("{} : {}", message, e.getMessage());
}

/**
* @return the current registration Id or <code>null</code> if the client is not registered.
*/
Expand Down

0 comments on commit b463fcf

Please sign in to comment.