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

Merge pull request #76875 from JieJhih/proxy/file

Browse Source 
handle file close error
This commit is contained in:
Kubernetes Prow Robot 2019-04-29 22:49:35 -07:00 committed by GitHub
commit b9fbed1324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -341,7 +341,7 @@ func (o *Options) runLoop() error {
}
}
func (o *Options) writeConfigFile() error {
func (o *Options) writeConfigFile() (err error) {
const mediaType = runtime.ContentTypeYAML
info, ok := runtime.SerializerInfoForMediaType(o.codecs.SupportedMediaTypes(), mediaType)
if !ok {
@ -354,10 +354,15 @@ func (o *Options) writeConfigFile() error {
if err != nil {
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
}