Skip to content

Commit bb204bb

Browse files
-refactored reload functions for backend initialization
1 parent 80c34ca commit bb204bb

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ func main() {
4747

4848
// Load config,discordbot, backupmgr and detectionmgr using the loader package
4949
loader.InitVirtFS(v1uiFS)
50-
loader.ReloadAll()
50+
loader.ReloadBackend()
5151
loader.InitDetector()
52+
5253
loader.AfterStartComplete()
5354

5455
terminal.StartConsole(&wg)

src/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
var (
1313
// All configuration variables can be found in vars.go
1414
Version = "5.5.6"
15-
Branch = "indev-no-steamcmd"
15+
Branch = "indev"
1616
)
1717

1818
type JsonConfig struct {

src/loader/loader.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,29 @@ import (
1515
"github.com/JacksonTheMaster/StationeersServerUI/v5/src/setup"
1616
)
1717

18-
func ReloadAll() {
18+
func ReloadBackend() {
19+
1920
ReloadConfig()
21+
ReloadSSCM()
22+
ReloadBackupManager()
23+
ReloadLocalizer()
2024
ReloadDiscordBot()
25+
PrintConfigDetails()
2126
}
2227

2328
func ReloadConfig() {
2429
if _, err := config.LoadConfig(); err != nil {
2530
logger.Core.Error("Failed to load config: " + err.Error())
2631
return
2732
}
33+
logger.Core.Info("Config loaded successfully")
2834

29-
logger.Core.Info("Config reloaded successfully")
35+
}
3036

37+
func ReloadSSCM() {
3138
if config.IsSSCMEnabled {
3239
setup.InstallSSCM()
3340
}
34-
ReloadBackupManager()
35-
ReloadLocalizer()
36-
PrintConfigDetails()
3741
}
3842

3943
func ReloadBackupManager() {

src/terminal/runtimecommands.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ func helpCommand(args []string) error {
141141
// init registers default cli commands and their aliases.
142142
func init() {
143143
RegisterCommand("help", helpCommand, "h")
144-
RegisterCommand("reloadbackend", WrapNoReturn(loader.ReloadAll), "rlb", "rb", "r")
145-
RegisterCommand("reloadconfig", WrapNoReturn(loader.ReloadConfig), "rlc", "rc")
144+
RegisterCommand("reloadbackend", WrapNoReturn(loader.ReloadConfig), "rlc", "rc", "rlb", "rb", "r")
146145
RegisterCommand("restartbackend", WrapNoReturn(loader.RestartBackend), "rsb")
147146
RegisterCommand("exit", WrapNoReturn(exitfromcli), "e")
148147
RegisterCommand("deleteconfig", WrapNoReturn(deleteConfig), "delc", "dc")

0 commit comments

Comments
 (0)