Skip to content

Commit 9fd729f

Browse files
committed
sweep: #7130 Do not overwrite the tornado port if already set
1 parent 7b5fedf commit 9fd729f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2432,7 +2432,13 @@ def addTornadoOptionsToCS(self, gConfig_o):
24322432
return S_ERROR(f"{instanceOption} not defined in {self.cfgFile}")
24332433
tornadoSection = cfgPath("Systems", "Tornado", compInstance)
24342434

2435-
cfg = self.__getCfg(tornadoSection, "Port", 8443)
2435+
if gConfig_o:
2436+
tornadoPort = gConfig_o.getValue(cfgPath(tornadoSection, "Port"), "8443")
2437+
else:
2438+
tornadoPort = self.localCfg.getOption(cfgPath(tornadoSection, "Port"), "8443")
2439+
2440+
cfg = self.__getCfg(tornadoSection, "Port", tornadoPort)
2441+
24362442
return self._addCfgToCS(cfg)
24372443

24382444
def setupTornadoService(self, system, component):

0 commit comments

Comments
 (0)