mirror of
https://github.com/alibaba/arthas.git
synced 2024-04-21 10:21:39 +00:00
fix ArthasBootstrap load arthas.properties with arthas.config.location/arthas.config.name config (#1852)
This commit is contained in:
@@ -299,7 +299,7 @@ public class ArthasBootstrap {
|
||||
String location = null;
|
||||
|
||||
if (arthasEnvironment.containsProperty(CONFIG_LOCATION_PROPERTY)) {
|
||||
location = arthasEnvironment.resolvePlaceholders(CONFIG_LOCATION_PROPERTY);
|
||||
location = arthasEnvironment.resolvePlaceholders(arthasEnvironment.getProperty(CONFIG_LOCATION_PROPERTY));
|
||||
}
|
||||
|
||||
if (location == null) {
|
||||
@@ -308,7 +308,7 @@ public class ArthasBootstrap {
|
||||
|
||||
String configName = "arthas";
|
||||
if (arthasEnvironment.containsProperty(CONFIG_NAME_PROPERTY)) {
|
||||
configName = arthasEnvironment.resolvePlaceholders(CONFIG_NAME_PROPERTY);
|
||||
configName = arthasEnvironment.resolvePlaceholders(arthasEnvironment.getProperty(CONFIG_NAME_PROPERTY));
|
||||
}
|
||||
|
||||
if (location != null) {
|
||||
|
||||
Reference in New Issue
Block a user