Skip to content

Commit 83e37e4

Browse files
committed
fix: support underscore dashboard env vars
1 parent 872bbf8 commit 83e37e4

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@ private static String getConfig(String name) {
7373
if (StringUtils.isNotEmpty(val)) {
7474
return val;
7575
}
76+
String underscoreName = name.replace('.', '_');
77+
if (!underscoreName.equals(name)) {
78+
val = System.getenv(underscoreName);
79+
if (StringUtils.isNotEmpty(val)) {
80+
return val;
81+
}
82+
}
7683
// properties
7784
val = System.getProperty(name);
7885
if (StringUtils.isNotEmpty(val)) {

sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfigTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ public void testGetConfigStr() {
4747
assertEquals("222", DashboardConfig.getConfigStr("a"));
4848
}
4949

50+
@Test
51+
public void testGetConfigStrFromUnderscoreEnv() {
52+
DashboardConfig.clearCache();
53+
54+
environmentVariables.set("sentinel_dashboard_auth_password", "from_env");
55+
56+
assertEquals("from_env", DashboardConfig.getAuthPassword());
57+
}
58+
5059
@Test
5160
public void testGetConfigInt() {
5261
// clear cache

0 commit comments

Comments
 (0)