File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ const { log, TAGS } = require('@rm/logger')
55
66const { state } = require ( '../services/state' )
77const { bindConnections } = require ( '../models' )
8- const { loadLatestAreas } = require ( '../services/areas' )
8+ const { loadCachedAreas , loadLatestAreas } = require ( '../services/areas' )
99const { loadAuthStrategies } = require ( '../routes/authRouter' )
1010const { 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 ) {
You can’t perform that action at this time.
0 commit comments