OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[telegram] Fixes exceptions that stop rules/actions from finishing (#11215) 

* reorder channel updates.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* catch exceptions.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Spotless fixed


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* increase timeout.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Fix NPE in action from causing issues.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* fix logger.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
pull/11241/head
Matthew Skinner 2021-09-11 21:34:23 +10:00 committed by GitHub
parent ce8fac8df2
commit d0c435b9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/TelegramHandler.java
View File

@ -156,7 +156,7 @@ public class TelegramHandler extends BaseThingHandler {
} }
OkHttpClient.Builder prepareConnection = new OkHttpClient.Builder().connectTimeout(75, TimeUnit.SECONDS) OkHttpClient.Builder prepareConnection = new OkHttpClient.Builder().connectTimeout(75, TimeUnit.SECONDS)
.readTimeout(75, TimeUnit.SECONDS); .writeTimeout(75, TimeUnit.SECONDS).readTimeout(75, TimeUnit.SECONDS);
String proxyHost = config.getProxyHost(); String proxyHost = config.getProxyHost();
Integer proxyPort = config.getProxyPort(); Integer proxyPort = config.getProxyPort();
@ -324,20 +324,20 @@ public class TelegramHandler extends BaseThingHandler {
update.callbackQuery().data()); update.callbackQuery().data());
} }
} }
updateChannel(LASTMESSAGETEXT, lastMessageText != null ? new StringType(lastMessageText) : UnDefType.NULL); updateChannel(CHATID, chatId != null ? new StringType(chatId.toString()) : UnDefType.NULL);
updateChannel(REPLYID, replyId != null ? new StringType(replyId) : UnDefType.NULL);
updateChannel(LASTMESSAGEURL, lastMessageURL != null ? new StringType(lastMessageURL) : UnDefType.NULL); updateChannel(LASTMESSAGEURL, lastMessageURL != null ? new StringType(lastMessageURL) : UnDefType.NULL);
updateChannel(LASTMESSAGEDATE, lastMessageDate != null
? new DateTimeType(
ZonedDateTime.ofInstant(Instant.ofEpochSecond(lastMessageDate.intValue()), ZoneOffset.UTC))
: UnDefType.NULL);
updateChannel(LASTMESSAGENAME, (lastMessageFirstName != null || lastMessageLastName != null) updateChannel(LASTMESSAGENAME, (lastMessageFirstName != null || lastMessageLastName != null)
? new StringType((lastMessageFirstName != null ? lastMessageFirstName + " " : "") ? new StringType((lastMessageFirstName != null ? lastMessageFirstName + " " : "")
+ (lastMessageLastName != null ? lastMessageLastName : "")) + (lastMessageLastName != null ? lastMessageLastName : ""))
: UnDefType.NULL); : UnDefType.NULL);
updateChannel(LASTMESSAGEUSERNAME, updateChannel(LASTMESSAGEUSERNAME,
lastMessageUsername != null ? new StringType(lastMessageUsername) : UnDefType.NULL); lastMessageUsername != null ? new StringType(lastMessageUsername) : UnDefType.NULL);
updateChannel(CHATID, chatId != null ? new StringType(chatId.toString()) : UnDefType.NULL); updateChannel(LASTMESSAGETEXT, lastMessageText != null ? new StringType(lastMessageText) : UnDefType.NULL);
updateChannel(REPLYID, replyId != null ? new StringType(replyId) : UnDefType.NULL); updateChannel(LASTMESSAGEDATE, lastMessageDate != null
? new DateTimeType(
ZonedDateTime.ofInstant(Instant.ofEpochSecond(lastMessageDate.intValue()), ZoneOffset.UTC))
: UnDefType.NULL);
} }
return UpdatesListener.CONFIRMED_UPDATES_ALL; return UpdatesListener.CONFIRMED_UPDATES_ALL;
} }

11
bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java
View File

@ -134,6 +134,10 @@ public class TelegramActions implements ThingActions {
} }
} }
Integer messageId = localHandler.removeMessageId(chatId, replyId); Integer messageId = localHandler.removeMessageId(chatId, replyId);
if (messageId == null) {
logger.warn("messageId could not be found for chatId {} and replyId {}", chatId, replyId);
return false;
}
logger.debug("remove messageId {} for chatId {} and replyId {}", messageId, chatId, replyId); logger.debug("remove messageId {} for chatId {} and replyId {}", messageId, chatId, replyId);
EditMessageReplyMarkup editReplyMarkup = new EditMessageReplyMarkup(chatId, messageId.intValue()) EditMessageReplyMarkup editReplyMarkup = new EditMessageReplyMarkup(chatId, messageId.intValue())
@ -239,7 +243,12 @@ public class TelegramActions implements ThingActions {
logger.warn("replyId {} must not contain spaces. ReplyMarkup will be ignored.", replyId); logger.warn("replyId {} must not contain spaces. ReplyMarkup will be ignored.", replyId);
} }
} }
SendResponse retMessage = localHandler.execute(sendMessage); SendResponse retMessage = null;
try {
retMessage = localHandler.execute(sendMessage);
} catch (Exception e) {
logger.warn("Exception occured whilst sending message:{}", e.getMessage());
}
if (!evaluateResponse(retMessage)) { if (!evaluateResponse(retMessage)) {
return false; return false;
} }