Skip to content

Commit cea3141

Browse files
committed
fix: area reload
1 parent 11c75e0 commit cea3141

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

server/src/utils/reloadConfig.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { log, TAGS } = require('@rm/logger')
55

66
const { state } = require('../services/state')
77
const { bindConnections } = require('../models')
8-
const { loadLatestAreas } = require('../services/areas')
8+
const { loadCachedAreas, loadLatestAreas } = require('../services/areas')
99
const { loadAuthStrategies } = require('../routes/authRouter')
1010
const { deepCompare } = require('./deepCompare')
1111

@@ -52,6 +52,10 @@ async function reloadConfig() {
5252
const newConfig = require('@rm/config')
5353

5454
const { areas, ...oldWithoutAreas } = oldConfig
55+
const primedAreas = areas || loadCachedAreas()
56+
// Prime areas early so config.getSafe('areas') never fails during reload.
57+
newConfig.setAreas(primedAreas)
58+
oldWithoutAreas.areas = primedAreas
5559

5660
const { report, areEqual, changed } = deepCompare(
5761
oldWithoutAreas,
@@ -69,8 +73,6 @@ async function reloadConfig() {
6973
!report.manualAreas.areEqual
7074
) {
7175
newConfig.setAreas(await loadLatestAreas())
72-
} else {
73-
newConfig.setAreas(areas)
7476
}
7577

7678
if (areEqual) {

0 commit comments

Comments
 (0)