Merge pull request containerd#1484 from yanxuean/loadconfig

crosbymichael · web-flow · commit cc75a112d757 · 2017-09-14T11:10:32.000-04:00
Improve server.LoadConfig function
diff --git a/server/config.go b/server/config.go
@@ -5,6 +5,8 @@ import (
 	"io"
 
 	"github.com/BurntSushi/toml"
+	"github.com/containerd/containerd/errdefs"
+	"github.com/pkg/errors"
 )
 
 // Config provides containerd configuration data for the server
@@ -77,7 +79,7 @@ func (c *Config) WriteTo(w io.Writer) (int64, error) {
 // LoadConfig loads the containerd server config from the provided path
 func LoadConfig(path string, v *Config) error {
 	if v == nil {
-		v = &Config{}
+		return errors.Wrapf(errdefs.ErrInvalidArgument, "argument v must not be nil")
 	}
 	md, err := toml.DecodeFile(path, v)
 	if err != nil {
