hyung-hwan/hodu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added --config-file-pattern to server and client

Browse Source
This commit is contained in:
hyung-hwan
2025-05-28 09:33:29 +09:00
parent db9fc1f4d9
commit cea0efcb18
2 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/config.go
View File

@ -5,10 +5,8 @@ import "crypto/tls"
import "crypto/x509"
import "encoding/base64"
import "encoding/pem"
import "errors"
import "fmt"
import "hodu"
import "io"
import "net/netip"
import "os"
import "strings"
@ -146,46 +144,32 @@ type ClientConfig struct {
} `yaml:"rpc"`
}
func load_server_config(cfgfile string) (*ServerConfig, error) {
var cfg ServerConfig
func load_server_config_to(cfgfile string, cfg *ServerConfig) error {
var f *os.File
var yd *yaml.Decoder
var err error
f, err = os.Open(cfgfile)
if err != nil && errors.Is(err, io.EOF) {
return nil, err
}
if err != nil { return err }
yd = yaml.NewDecoder(f, yaml.AllowDuplicateMapKey(), yaml.DisallowUnknownField())
err = yd.Decode(&cfg)
err = yd.Decode(cfg)
f.Close()
if err != nil {
return nil, err
}
return &cfg, nil
return err
}
func load_client_config(cfgfile string) (*ClientConfig, error) {
var cfg ClientConfig
func load_client_config_to(cfgfile string, cfg *ClientConfig) error {
var f *os.File
var yd *yaml.Decoder
var err error
f, err = os.Open(cfgfile)
if err != nil && errors.Is(err, io.EOF) {
return nil, err
}
if err != nil { return err }
yd = yaml.NewDecoder(f)
err = yd.Decode(&cfg)
err = yd.Decode(cfg)
f.Close()
if err != nil {
return nil, err
}
return &cfg, nil
return err
}