Skip to content

Commit

Permalink
[Release] 3.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Akkadius committed Feb 4, 2024
1 parent ba42ee9 commit 203a17c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [3.12.1] 2/4/2024
## [3.12.2] 2/4/2024

* **Database** Implement log database connection resolving. This allows operators to utilize the "QS" database connection type for logs, particularly sinking player event logs to an external database or server. When a QS connection is specified in the `eqemu_config.json` - player event logs will automatically route to that connection. This is useful for operators who want to sink logs to an external database or server for auditing purposes. The database configuration gets synchronized and injected during Spire bootup and also during Spire Admin configuration saving.
* **Player Event Log Viewer** Player event log request is split from character data bulk loading two split the queries on separate connections
Expand Down
22 changes: 10 additions & 12 deletions internal/spire/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ func (o *Init) CreateDefaultDatabaseConnectionFromConfig(user models.User) error
c.DbPassword = o.crypt.Encrypt(cfg.Server.Database.Password, o.GetEncKey(user.ID))

// content db if exists
c.ContentDbHost = ""
c.ContentDbPort = ""
c.ContentDbName = ""
c.ContentDbUsername = ""
c.ContentDbPassword = ""
if cfg.Server.ContentDatabase != nil {
if len(cfg.Server.ContentDatabase.Host) > 0 {
c.ContentDbHost = cfg.Server.ContentDatabase.Host
Expand All @@ -174,15 +179,14 @@ func (o *Init) CreateDefaultDatabaseConnectionFromConfig(user models.User) error
if len(cfg.Server.ContentDatabase.Password) > 0 {
c.ContentDbPassword = o.crypt.Encrypt(cfg.Server.ContentDatabase.Password, o.GetEncKey(user.ID))
}
} else {
c.ContentDbHost = ""
c.ContentDbPort = ""
c.ContentDbName = ""
c.ContentDbUsername = ""
c.ContentDbPassword = ""
}

// logs db if exists
c.LogsDbHost = ""
c.LogsDbPort = ""
c.LogsDbName = ""
c.LogsDbUsername = ""
c.LogsDbPassword = ""
if cfg.Server.Qsdatabase != nil {
if len(cfg.Server.Qsdatabase.Host) > 0 {
c.LogsDbHost = cfg.Server.Qsdatabase.Host
Expand All @@ -199,12 +203,6 @@ func (o *Init) CreateDefaultDatabaseConnectionFromConfig(user models.User) error
if len(cfg.Server.Qsdatabase.Password) > 0 {
c.LogsDbPassword = o.crypt.Encrypt(cfg.Server.Qsdatabase.Password, o.GetEncKey(user.ID))
}
} else {
c.LogsDbHost = ""
c.LogsDbPort = ""
c.LogsDbName = ""
c.LogsDbUsername = ""
c.LogsDbPassword = ""
}

db.Save(&c)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spire",
"version": "3.12.1",
"version": "3.12.2",
"repository": {
"type": "git",
"url": "https://github.com/Akkadius/spire.git"
Expand Down

0 comments on commit 203a17c

Please sign in to comment.