Skip to content
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

Jump to bottom

Hazelcast shutdown logs are not available out-of-the-box #32184

Closed
wants to merge 2 commits into from
Closed

Hazelcast shutdown logs are not available out-of-the-box #32184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db270a6
Fix shutdown logging in Hazelcast
ldziedziul Aug 29, 2022
6869773
Fix formatting
ldziedziul Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...n/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java
View file
Open in desktop
Expand Up @@ -51,6 +51,7 @@
class HazelcastServerConfiguration {

static final String CONFIG_SYSTEM_PROPERTY = "hazelcast.config";
static final String HAZELCAST_LOGGING_TYPE = "hazelcast.logging.type";

private static HazelcastInstance getHazelcastInstance(Config config) {
if (StringUtils.hasText(config.getInstanceName())) {
Expand Down Expand Up @@ -123,6 +124,22 @@ HazelcastConfigCustomizer springManagedContextHazelcastConfigCustomizer(Applicat

}

@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(org.slf4j.Logger.class)
static class LoggingHazelcastConfigCustomizerConfiguration {

@Bean
@Order(0)
HazelcastConfigCustomizer loggingHazelcastConfigCustomizer() {
return (config) -> {
if (!config.getProperties().containsKey(HAZELCAST_LOGGING_TYPE)) {
config.setProperty(HAZELCAST_LOGGING_TYPE, "slf4j");
}
};
}

}

/**
* {@link HazelcastConfigResourceCondition} that checks if the
* {@code spring.hazelcast.config} configuration key is defined.
Expand Down
28 changes: 28 additions & 0 deletions ...g/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java
View file
Open in desktop
Expand Up @@ -206,6 +206,22 @@ void autoConfiguredContextCanOverrideManagementContextUsingCustomizer() {
});
}

@Test
void configWithDefaultLoggingTypeSlf4j() {
this.contextRunner.run((context) -> {
Config config = context.getBean(HazelcastInstance.class).getConfig();
assertThat(config.getProperty(HazelcastServerConfiguration.HAZELCAST_LOGGING_TYPE)).isEqualTo("slf4j");
});
}

@Test
void configWithExplicitLoggingType() {
this.contextRunner.withUserConfiguration(HazelcastConfigWithJDKLogging.class).run((context) -> {
Config config = context.getBean(HazelcastInstance.class).getConfig();
assertThat(config.getProperty(HazelcastServerConfiguration.HAZELCAST_LOGGING_TYPE)).isEqualTo("jdk");
});
}

private static Config createTestConfig(String instanceName) {
Config config = new Config(instanceName);
JoinConfig join = config.getNetworkConfig().getJoin();
Expand Down Expand Up @@ -236,6 +252,18 @@ Config anotherHazelcastConfig() {

}

@Configuration(proxyBeanMethods = false)
static class HazelcastConfigWithJDKLogging {

@Bean
Config anotherHazelcastConfig() {
Config config = new Config();
config.setProperty(HazelcastServerConfiguration.HAZELCAST_LOGGING_TYPE, "jdk");
return config;
}

}

@SpringAware
static class SpringAwareEntryProcessor<V> implements EntryProcessor<String, V, String> {

Expand Down