forked from External/ergo
fix #1622
Allow users to set max MySQL connections and connection lifetime; set a sane default for max connections if it's not present.
This commit is contained in:
parent
a2b5548c8b
commit
5eed48c077
5 changed files with 23 additions and 0 deletions
|
|
@ -18,6 +18,7 @@ import (
|
|||
"path/filepath"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
|
@ -1478,6 +1479,12 @@ func LoadConfig(filename string) (config *Config, err error) {
|
|||
|
||||
config.Datastore.MySQL.ExpireTime = time.Duration(config.History.Restrictions.ExpireTime)
|
||||
config.Datastore.MySQL.TrackAccountMessages = config.History.Retention.EnableAccountIndexing
|
||||
if config.Datastore.MySQL.MaxConns == 0 {
|
||||
// #1622: not putting an upper limit on the number of MySQL connections is
|
||||
// potentially dangerous. as a naive heuristic, assume they're running on the
|
||||
// same machine:
|
||||
config.Datastore.MySQL.MaxConns = runtime.NumCPU()
|
||||
}
|
||||
|
||||
config.Server.Cloaks.Initialize()
|
||||
if config.Server.Cloaks.Enabled {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue