Retry / File State Storage #385
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,41 @@ | ||
| package org.finos.springbot.teams; | ||
|
|
||
| import org.finos.springbot.teams.handlers.TeamsResponseHandler; | ||
| import org.finos.springbot.teams.handlers.retry.NoOpRetryHandler; | ||
| import org.finos.springbot.teams.handlers.retry.MessageRetryHandler; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.scheduling.annotation.EnableScheduling; | ||
| import org.springframework.scheduling.annotation.SchedulingConfigurer; | ||
| import org.springframework.scheduling.config.ScheduledTaskRegistrar; | ||
|
|
||
| @EnableScheduling | ||
| public class TeamsScheduledConfig implements SchedulingConfigurer { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(TeamsScheduledConfig.class); | ||
|
|
||
| @Autowired | ||
| private TeamsResponseHandler handler; | ||
|
|
||
| @Autowired | ||
| private MessageRetryHandler retryHandler; | ||
|
|
||
| @Value("${teams.retry.time:30000}") | ||
| private long teamsRetrySchedulerCron; | ||
|
|
||
| @Override | ||
| public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { | ||
| if (retryHandler instanceof NoOpRetryHandler) { | ||
| LOG.info("No-operation retry handler is configured."); | ||
| } else { | ||
| Runnable runnable = () -> scheduleRetryMessage(); | ||
| scheduledTaskRegistrar.addFixedDelayTask(runnable, teamsRetrySchedulerCron); | ||
| } | ||
| } | ||
|
|
||
| private void scheduleRetryMessage() { | ||
| handler.retryMessage(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.finos.springbot.teams.handlers.retry; | ||
|
|
||
| import java.time.LocalDateTime; | ||
| import java.util.concurrent.CompletionException; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.finos.springbot.workflow.response.Response; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.http.HttpStatus; | ||
|
|
||
| import com.microsoft.bot.connector.rest.ErrorResponseException; | ||
|
|
||
| import okhttp3.ResponseBody; | ||
|
|
||
| public abstract class BasicMessageRetryHandler implements MessageRetryHandler { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(BasicMessageRetryHandler.class); | ||
|
|
||
| @Value("${teams.retry.count:3}") | ||
| private long teamsRetryCount; | ||
|
|
||
| public boolean handleException(Response t, int retryCount, Throwable e) { | ||
| if (e instanceof CompletionException | ||
| && ((CompletionException) e).getCause() instanceof ErrorResponseException) { | ||
| ErrorResponseException ere = (ErrorResponseException) ((CompletionException) e).getCause(); | ||
| retrofit2.Response<ResponseBody> response = ere.response(); | ||
| if (response.code() == HttpStatus.TOO_MANY_REQUESTS.value() && retryCount <= teamsRetryCount) { | ||
| String retryAfter = response.headers().get("Retry-After"); | ||
| LOG.info("MessageRetryHandler request retryAfter {}", retryAfter); | ||
|
|
||
| int retryAfterInt = 1;//initiate to 1 sec | ||
| if(StringUtils.isNumeric(retryAfter)) { | ||
| retryAfterInt = Integer.parseInt(retryAfter); | ||
| } | ||
| LocalDateTime time = LocalDateTime.now().plusSeconds(retryAfterInt); | ||
| add(new MessageRetry(t, retryCount, retryAfterInt, time)); | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we not have retryHandler in a subclass? e.g.
RetryingTeamsResponseHandler?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes done as per review comments