up

RockyLOMO · Oct 19, 2023 · c080bf8 · c080bf8
1 parent 7ee9245
commit c080bf8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/rxlib/src/main/java/org/rx/core/Constants.java b/rxlib/src/main/java/org/rx/core/Constants.java
@@ -15,7 +15,7 @@ enum MetricName {
  long TB = GB * 1024L;
  int SIZE_4K = KB * 4;
 
- String DEFAULT_CONFIG_FILE = "rx.yml";
+ String[] DEFAULT_CONFIG_FILES = {"rx.yml", "application.yml", "bootstrap.yml"};
  int CPU_THREADS = Runtime.getRuntime().availableProcessors();
  String DEFAULT_TRACE_NAME = "rx-traceId";
 

diff --git a/rxlib/src/main/java/org/rx/core/YamlConfiguration.java b/rxlib/src/main/java/org/rx/core/YamlConfiguration.java
@@ -35,8 +35,7 @@ public static class ChangedEventArgs extends EventArgs {
  final String filePath;
  }
 
- static final String APP_CONFIG_FILE = "application.yml";
- public static final YamlConfiguration RX_CONF = new YamlConfiguration(Constants.DEFAULT_CONFIG_FILE, APP_CONFIG_FILE);
+ public static final YamlConfiguration RX_CONF = new YamlConfiguration(Constants.DEFAULT_CONFIG_FILES);
 
  public static Map<String, Object> loadYaml(String... fileNames) {
  return loadYaml(Linq.from(fileNames).selectMany(p -> {

diff --git a/rxlib/src/test/java/org/rx/core/TestCore.java b/rxlib/src/test/java/org/rx/core/TestCore.java
@@ -968,7 +968,7 @@ public void dynamicProxy() {
  @SneakyThrows
  @Test
  public void reflect() {
- for (InputStream resource : Reflects.getResources(Constants.DEFAULT_CONFIG_FILE)) {
+ for (InputStream resource : Reflects.getResources(Constants.DEFAULT_CONFIG_FILES[0])) {
  System.out.println(resource);
  assert resource != null;
  }