Skip to content

Commit

Permalink
Fix startup and EPP ordering (#5670)
Browse files Browse the repository at this point in the history
  • Loading branch information
onobc authored Feb 9, 2024
1 parent 27d9941 commit de58247
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
import org.springframework.boot.env.EnvironmentPostProcessor;
import org.springframework.core.Ordered;
import org.springframework.core.env.ConfigurableEnvironment;
Expand All @@ -49,6 +50,11 @@ public class DefaultEnvironmentPostProcessor implements EnvironmentPostProcessor

private static final Logger logger = LoggerFactory.getLogger(DefaultEnvironmentPostProcessor.class);

/**
* The order for the processor - must run before the {@link ConfigDataEnvironmentPostProcessor}.
*/
public static final int ORDER = ConfigDataEnvironmentPostProcessor.ORDER - 5;

private final Resource serverResource = new ClassPathResource("/dataflow-server.yml");

private final Resource serverDefaultsResource = new ClassPathResource("META-INF/dataflow-server-defaults.yml");
Expand Down Expand Up @@ -106,6 +112,6 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp

@Override
public int getOrder() {
return 0;
return ORDER;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ server:
error:
include-message: always
spring:
config:
use-legacy-processing: true
mvc.async.request-timeout: 120000
batch:
initialize-schema: never
Expand Down

0 comments on commit de58247

Please sign in to comment.