github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Improve server.LoadConfig function

Browse Source 
Cann't use the new created config in server.LoadConfig When arg v is nil
fix #1483

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
This commit is contained in:
yanxuean 2017-09-07 15:55:48 +08:00
parent bb7b41ad7b
commit 39b5f90b18
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/config.go
View File

@ -5,6 +5,8 @@ import (
"io" "io"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/containerd/containerd/errdefs"
"github.com/pkg/errors"
) )
// Config provides containerd configuration data for the server // Config provides containerd configuration data for the server
@ -69,7 +71,7 @@ func (c *Config) WriteTo(w io.Writer) (int64, error) {
// LoadConfig loads the containerd server config from the provided path // LoadConfig loads the containerd server config from the provided path
func LoadConfig(path string, v *Config) error { func LoadConfig(path string, v *Config) error {
if v == nil { if v == nil {
v = &Config{} return errors.Wrapf(errdefs.ErrInvalidArgument, "argument v must not be nil")
} }
md, err := toml.DecodeFile(path, v) md, err := toml.DecodeFile(path, v)
if err != nil { if err != nil {