Skip to content

Fix startup and EPP ordering #5670

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

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Fix startup and EPP ordering #5670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...ava/org/springframework/cloud/dataflow/server/config/DefaultEnvironmentPostProcessor.java
View file
Open in desktop
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;
}
}
2 changes: 2 additions & 0 deletions spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
View file
Open in desktop
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