GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 10:42:52 +01:00
Code Issues Projects Releases Wiki Activity

remove redundant error check

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-12-19 18:41:46 -05:00
parent 82e965db39
commit 0df25e0e30
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/config.go
View File

@ -618,6 +618,7 @@ func LoadConfig(filename string) (config *Config, err error) {
if !utils.IsServerName(config.Server.Name) { if !utils.IsServerName(config.Server.Name) {
return nil, ErrServerNameNotHostname return nil, ErrServerNameNotHostname
} }
config.Server.nameCasefolded = strings.ToLower(config.Server.Name)
if config.Datastore.Path == "" { if config.Datastore.Path == "" {
return nil, ErrDatastorePathMissing return nil, ErrDatastorePathMissing
} }
@ -804,12 +805,6 @@ func LoadConfig(filename string) (config *Config, err error) {
config.Debug.recoverFromErrors = true config.Debug.recoverFromErrors = true
} }
// casefold/validate server name
config.Server.nameCasefolded = strings.ToLower(config.Server.Name)
if err != nil {
return nil, fmt.Errorf("Server name isn't valid [%s]: %s", config.Server.Name, err.Error())
}
// process operator definitions, store them to config.operators // process operator definitions, store them to config.operators
operclasses, err := config.OperatorClasses() operclasses, err := config.OperatorClasses()
if err != nil { if err != nil {