github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

handle file close error

Browse Source
This commit is contained in:
JieJhih Jhang 2019-04-21 16:28:46 +08:00
parent 1377108c08
commit 84d29664c4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kube-proxy/app/server.go
View File

@ -334,7 +334,7 @@ func (o *Options) runLoop() error {
} }
} }
func (o *Options) writeConfigFile() error { func (o *Options) writeConfigFile() (err error) {
const mediaType = runtime.ContentTypeYAML const mediaType = runtime.ContentTypeYAML
info, ok := runtime.SerializerInfoForMediaType(o.codecs.SupportedMediaTypes(), mediaType) info, ok := runtime.SerializerInfoForMediaType(o.codecs.SupportedMediaTypes(), mediaType)
if !ok { if !ok {
@ -347,10 +347,15 @@ func (o *Options) writeConfigFile() error {
if err != nil { if err != nil {
return err return err
} }
// TODO handle error
defer configFile.Close()
if err := encoder.Encode(o.config, configFile); err != nil { defer func() {
ferr := configFile.Close()
if ferr != nil && err == nil {
err = ferr
}
}()
if err = encoder.Encode(o.config, configFile); err != nil {
return err return err
} }