Skip to content

fix: stop StatusUpdateTrigger from overriding user-configured StatusUpdater timeout #5210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
herley-shaori wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −9
Open

fix: stop StatusUpdateTrigger from overriding user-configured StatusUpdater timeout #5210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...r/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ public InstanceIdGenerator instanceIdGenerator() {
@ConditionalOnMissingBean
public StatusUpdater statusUpdater(InstanceRepository instanceRepository,
InstanceWebClient.Builder instanceWebClientBuilder) {
return new StatusUpdater(instanceRepository, instanceWebClientBuilder.build(), new ApiMediaTypeHandler());
return new StatusUpdater(instanceRepository, instanceWebClientBuilder.build(), new ApiMediaTypeHandler())
.timeout(this.adminServerProperties.getMonitor().getDefaultTimeout());
}

@Bean(initMethod = "start", destroyMethod = "stop")
Expand Down
11 changes: 4 additions & 7 deletions ...n-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,10 @@ protected Publisher<Void> handle(Flux<InstanceEvent> publisher) {
}

protected Mono<Void> updateStatus(InstanceId instanceId) {
return this.statusUpdater.timeout(this.intervalCheck.getInterval())
.updateStatus(instanceId)
.onErrorResume((e) -> {
log.warn("Unexpected error while updating status for {}", instanceId, e);
return Mono.empty();
})
.doFinally((s) -> this.intervalCheck.markAsChecked(instanceId));
return this.statusUpdater.updateStatus(instanceId).onErrorResume((e) -> {
log.warn("Unexpected error while updating status for {}", instanceId, e);
return Mono.empty();
}).doFinally((s) -> this.intervalCheck.markAsChecked(instanceId));
}

@Override
Expand Down
1 change: 0 additions & 1 deletion ...rver/src/test/java/de/codecentric/boot/admin/server/services/StatusUpdateTriggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ class StatusUpdateTriggerTest {
@BeforeEach
void setUp() {
when(this.updater.updateStatus(any(InstanceId.class))).thenReturn(Mono.empty());
when(this.updater.timeout(any())).thenReturn(this.updater);

this.trigger = new StatusUpdateTrigger(this.updater, this.events.flux(), Duration.ofSeconds(10),
Duration.ofSeconds(10), Duration.ofSeconds(60));
Expand Down