Browse Source

lwm2m: if client reboot or new connect and sharedAttribute not change: log "warn" ...Value is not changed

"error" ...Value is  bad
pull/5171/head
nickAS21 5 years ago
parent
commit
e68a713b4f
  1. 14
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java

14
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java

@ -226,13 +226,13 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService {
String logMsg = String.format("%s: Failed update resource versionedId - %s value - %s. New value is bad", String logMsg = String.format("%s: Failed update resource versionedId - %s value - %s. New value is bad",
LOG_LWM2M_ERROR, versionedId, "null"); LOG_LWM2M_ERROR, versionedId, "null");
logService.log(lwM2MClient, logMsg); logService.log(lwM2MClient, logMsg);
log.error("Failed update resource [{}] [{}]", versionedId, newValue); log.error("Failed update resource [{}] [{}]", versionedId, "null");
} else if ((valueOld != null && newValue.toString().equals(valueOld.toString()))){ } else if (newValue.toString().equals(valueOld.toString())){
if (logFailedUpdateOfNonChangedValue) { if (logFailedUpdateOfNonChangedValue) {
String logMsg = String.format("%s: Failed update resource versionedId - %s value - %s. Value is not changed", String logMsg = String.format("%s: Didn't update the versionedId resource - %s value - %s. Value is not changed",
LOG_LWM2M_INFO, versionedId, newValue); LOG_LWM2M_WARN, versionedId, newValue);
logService.log(lwM2MClient, logMsg); logService.log(lwM2MClient, logMsg);
log.info("Failed update resource [{}] [{}]. Value is not changed", versionedId, newValue); log.warn("Didn't update resource [{}] [{}]. Value is not changed", versionedId, newValue);
} }
} else { } else {
TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValue).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValue).timeout(clientContext.getRequestTimeout(lwM2MClient)).build();
@ -263,8 +263,8 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService {
TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValues).timeout(this.config.getTimeout()).build(); TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValues).timeout(this.config.getTimeout()).build();
downlinkHandler.sendWriteReplaceRequest(client, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, client, versionedId)); downlinkHandler.sendWriteReplaceRequest(client, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, client, versionedId));
} else { } else {
log.warn("Failed update resource [{}] [{}]", versionedId, newValProto); log.warn("Didn't update resource [{}] [{}]", versionedId, newValProto);
String logMsg = String.format("%s: Failed update resource versionedId - %s value - %s. Value is not changed or bad", String logMsg = String.format("%s: Didn't update resource versionedId - %s value - %s. Value is not changed",
LOG_LWM2M_WARN, versionedId, newValProto); LOG_LWM2M_WARN, versionedId, newValProto);
logService.log(client, logMsg); logService.log(client, logMsg);
} }

Loading…
Cancel
Save