public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[keba] Robustness improvements on communication error (#10399)

Browse Source 
Signed-off-by: Michael Weger <weger.michael@gmx.net>
This commit is contained in:
MikeTheTux 2021-04-17 23:52:33 +02:00 committed by GitHub
parent 8258d9d722
commit fb1d6a283b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
View File

@ -181,25 +181,31 @@ public class KeContactHandler extends BaseThingHandler {
long stamp = System.currentTimeMillis(); long stamp = System.currentTimeMillis();
if (!isKebaReachable()) { if (!isKebaReachable()) {
logger.debug("isKebaReachable() timed out after '{}' milliseconds", System.currentTimeMillis() - stamp); logger.debug("isKebaReachable() timed out after '{}' milliseconds", System.currentTimeMillis() - stamp);
transceiver.unRegisterHandler(getHandler()); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"An timeout occurred while polling the charging station");
} else { } else {
if (getThing().getStatus() == ThingStatus.ONLINE) {
ByteBuffer response = cache.get(CACHE_REPORT_1); ByteBuffer response = cache.get(CACHE_REPORT_1);
if (response != null) { if (response == null) {
logger.debug("Missing response from Keba station for 'report 1'");
} else {
onData(response); onData(response);
} }
Thread.sleep(REPORT_INTERVAL); Thread.sleep(REPORT_INTERVAL);
response = cache.get(CACHE_REPORT_2); response = cache.get(CACHE_REPORT_2);
if (response != null) { if (response == null) {
logger.debug("Missing response from Keba station for 'report 2'");
} else {
onData(response); onData(response);
} }
Thread.sleep(REPORT_INTERVAL); Thread.sleep(REPORT_INTERVAL);
response = cache.get(CACHE_REPORT_3); response = cache.get(CACHE_REPORT_3);
if (response != null) { if (response == null) {
logger.debug("Missing response from Keba station for 'report 3'");
} else {
onData(response); onData(response);
} }
@ -207,25 +213,29 @@ public class KeContactHandler extends BaseThingHandler {
Thread.sleep(REPORT_INTERVAL); Thread.sleep(REPORT_INTERVAL);
response = cache.get(CACHE_REPORT_100); response = cache.get(CACHE_REPORT_100);
if (response != null) { if (response == null) {
logger.debug("Missing response from Keba station for 'report 100'");
} else {
onData(response); onData(response);
} }
isReport100needed = false; isReport100needed = false;
} }
} }
} } catch (IOException e) {
} catch (NumberFormatException | IOException e) { logger.debug("An error occurred while polling the KEBA KeContact '{}': {}", getThing().getUID(),
logger.debug("An exception occurred while polling the KEBA KeContact '{}': {}", getThing().getUID(),
e.getMessage(), e); e.getMessage(), e);
Thread.currentThread().interrupt();
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"An exception occurred while while polling the charging station"); "An error occurred while polling the charging station");
} catch (InterruptedException e) { } catch (InterruptedException e) {
logger.debug("Polling job has been interrupted for handler of thing '{}'.", getThing().getUID()); logger.debug("Polling job has been interrupted for handler of thing '{}'.", getThing().getUID());
} }
} }
protected void onData(ByteBuffer byteBuffer) { protected void onData(ByteBuffer byteBuffer) {
if (getThing().getStatus() != ThingStatus.ONLINE) {
updateStatus(ThingStatus.ONLINE);
}
String response = new String(byteBuffer.array(), 0, byteBuffer.limit()); String response = new String(byteBuffer.array(), 0, byteBuffer.limit());
response = StringUtils.chomp(response); response = StringUtils.chomp(response);