Skip to content

Commit 67707a1

Browse files
committed
fix(#4175): add conditions for notifier auto-configuration to check if admin server is enabled
1 parent 4ccd949 commit 67707a1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerNotifierAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
import de.codecentric.boot.admin.server.notify.filter.web.NotificationFilterController;
7575

7676
@Configuration(proxyBeanMethods = false)
77+
@Conditional(SpringBootAdminServerEnabledCondition.class)
78+
@ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
7779
@EnableConfigurationProperties(NotifierProxyProperties.class)
7880
@AutoConfigureAfter({ MailSenderAutoConfiguration.class })
7981
public class AdminServerNotifierAutoConfiguration {

0 commit comments

Comments
 (0)