Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UCS] Consolidate configuration block #3768

Merged
merged 6 commits into from Jan 7, 2024
Merged

Conversation

Akkadius
Copy link
Member

@Akkadius Akkadius commented Dec 15, 2023

This PR consolidates our redundant UCS fields and automatically migrates the server configuration seamlessly for users.

This helps further efforts started and initiated by @joligario in PR #3765

What needs to be done in conjunction

  • Occulus
  • Spire
  • Akk-stack
  • EQEmu Docs
  • TalkEQ
  • Installer Template
  • Automatic configuration conversion

Automatic Configuration Migration

During a process bootup the automatic configuration occurs.

Before we do anything, we backup the config to eqemu_config.ucs-migrate-json.bak

   UCS |    Info    | LoadPaths server [/home/eqemu/server] 
   UCS |    Info    | parse_config Migrating old [eqemu_config] UCS configuration to new configuration 
   UCS |    Info    | parse_config Old configuration backed up to [/home/eqemu/server/eqemu_config.ucs-migrate-json.bak] 
   UCS |    Info    | parse_config New configuration written to [/home/eqemu/server/eqemu_config.json] 
   UCS |    Info    | parse_config Migration complete, please review the new configuration file 

Before (Truncated)

{
 "server": {
  "chatserver": {
   "port": "7778",
   "host": "127.0.0.1"
  },
  "mailserver": {
   "host": "127.0.0.1",
   "port": "7778"
  },
}

After (Truncated)

Old fields get deleted

{
  "server": {
    "ucs": {
      "host": "127.0.0.1",
      "port": "7778"
    },
  },
}

@Akkadius
Copy link
Member Author

I'll take care of Spire / Occulus / akk-stack later unless someone wants to try to help out there

common/eqemu_config.cpp Outdated Show resolved Hide resolved
@Kinglykrab
Copy link
Contributor

Is this good to go? @Akkadius

@Akkadius
Copy link
Member Author

Akkadius commented Dec 27, 2023

Is this good to go? @Akkadius

Still needs

  • Occulus
  • Spire
  • Akk-stack

@Akkadius
Copy link
Member Author

I'll wrap up the other bullets in the next day or so - have had a few other demanding things going on

@Akkadius Akkadius merged commit a3a707a into master Jan 7, 2024
2 checks passed
@Akkadius Akkadius deleted the akkadius/ucs-config-migrate branch January 7, 2024 03:55
@Akkadius Akkadius mentioned this pull request Jan 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants