Skip to content

Commit 6d774c6

Browse files
committed
dont propagate error event messages if the adapter is already stopped
1 parent b327fc0 commit 6d774c6

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

hivemq-edge/src/main/java/com/hivemq/bootstrap/ioc/Injector.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,10 @@
5757
import com.hivemq.uns.ioc.UnsServiceModule;
5858
import dagger.BindsInstance;
5959
import dagger.Component;
60-
6160
import jakarta.inject.Singleton;
61+
6262
import java.util.Set;
6363
import java.util.concurrent.ExecutorService;
64-
import java.util.concurrent.ScheduledExecutorService;
6564

6665
@SuppressWarnings({"NullabilityAnnotations", "UnusedReturnValue"})
6766
@Component(modules = {
@@ -123,11 +122,8 @@ public interface Injector {
123122

124123
// UnsServiceModule uns();
125124

126-
// Executor accessors for coordinated shutdown
127125
ExecutorService executorService();
128126

129-
ScheduledExecutorService scheduledExecutor();
130-
131127
@Component.Builder
132128
interface Builder {
133129

hivemq-edge/src/main/java/com/hivemq/edge/modules/adapters/impl/ProtocolAdapterStateImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ public void reportErrorMessage(
8585
// This is can be sent through the API to give an indication of the
8686
// status of an adapter runtime.
8787
lastErrorMessage.set(errorMessage == null ? throwable == null ? null : throwable.getMessage() : errorMessage);
88-
if (sendEvent) {
88+
// Don't send error events if the adapter is already stopped
89+
if (sendEvent && runtimeStatus.get() != RuntimeStatus.STOPPED) {
8990
final var eventBuilder = eventService.createAdapterEvent(adapterId, protocolId)
9091
.withSeverity(EventImpl.SEVERITY.ERROR)
9192
.withMessage(String.format("Adapter '%s' encountered an error.", adapterId));

0 commit comments

Comments
 (0)