Skip to content

fix(#4175): add conditions for notifier auto-configuration to check if admin server is enabled #4203

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.

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

Merged
merged 1 commit into from
Apr 17, 2025

Conversation

SteKoe
Copy link
Contributor

@SteKoe SteKoe commented Apr 16, 2025

closes #4175

@SteKoe SteKoe requested a review from a team as a code owner April 16, 2025 13:22
@@ -74,6 +74,8 @@
import de.codecentric.boot.admin.server.notify.filter.web.NotificationFilterController;

@Configuration(proxyBeanMethods = false)
@Conditional(SpringBootAdminServerEnabledCondition.class)
@ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with the first condition, the second one should not be needed

@SteKoe SteKoe force-pushed the fix/4175-mailsender-error-when-server-is-disabled branch from 67707a1 to eb12044 Compare April 17, 2025 07:51
@SteKoe SteKoe merged commit fc2e652 into master Apr 17, 2025
2 checks passed
@SteKoe SteKoe deleted the fix/4175-mailsender-error-when-server-is-disabled branch April 17, 2025 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot startup when MailSender exists and server is disabled
2 participants