Merge pull request #3504 from nspcc-dev/fix-loadcfg

config: get back default node configuration values
This commit is contained in:
Anna Shaleva 2024-07-05 19:49:27 +03:00 committed by GitHub
commit da40f2de14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
"time"
"github.com/nspcc-dev/neo-go/config" "github.com/nspcc-dev/neo-go/config"
"github.com/nspcc-dev/neo-go/pkg/config/netmode" "github.com/nspcc-dev/neo-go/pkg/config/netmode"
@ -81,7 +82,6 @@ func LoadFile(configPath string, relativePath ...string) (Config, error) {
var ( var (
configData []byte configData []byte
err error err error
config Config
) )
if _, err = os.Stat(configPath); os.IsNotExist(err) { if _, err = os.Stat(configPath); os.IsNotExist(err) {
configData, err = getEmbeddedConfig(configPath) configData, err = getEmbeddedConfig(configPath)
@ -94,6 +94,14 @@ func LoadFile(configPath string, relativePath ...string) (Config, error) {
return Config{}, fmt.Errorf("unable to read config: %w", err) return Config{}, fmt.Errorf("unable to read config: %w", err)
} }
} }
config := Config{
ApplicationConfiguration: ApplicationConfiguration{
P2P: P2P{
PingInterval: 30 * time.Second,
PingTimeout: 90 * time.Second,
},
},
}
decoder := yaml.NewDecoder(bytes.NewReader(configData)) decoder := yaml.NewDecoder(bytes.NewReader(configData))
decoder.KnownFields(true) decoder.KnownFields(true)
err = decoder.Decode(&config) err = decoder.Decode(&config)