Skip to content

Commit

Permalink
refactor write config
Browse files Browse the repository at this point in the history
Signed-off-by: qinpengfei <[email protected]>
  • Loading branch information
qinpengfei committed Nov 6, 2018
1 parent 563d62a commit baf72e2
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions internal/nginx/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,15 +402,10 @@ func (nginx *Controller) UpdateMainConfigFile(cfg []byte) {
}

if !nginx.local {
w, err := os.Create(filename)
err := createFileAndWrite(filename, cfg)
if err != nil {
glog.Fatalf("Failed to open %v: %v", filename, err)
glog.Fatalf("%v", err.Error())
}
_, err = w.Write(cfg)
if err != nil {
glog.Fatalf("Failed to write to %v: %v", filename, err)
}
defer w.Close()
}
glog.V(3).Infof("The main NGINX config file has been updated")
}
Expand All @@ -425,15 +420,10 @@ func (nginx *Controller) UpdateIngressConfigFile(name string, cfg []byte) {
}

if !nginx.local {
w, err := os.Create(filename)
if err != nil {
glog.Fatalf("Failed to open %v: %v", filename, err)
}
_, err = w.Write(cfg)
err := createFileAndWrite(filename, cfg)
if err != nil {
glog.Fatalf("Failed to write to %v: %v", filename, err)
glog.Fatalf("%v", err.Error())
}
defer w.Close()
}
glog.V(3).Infof("The Ingress config file has been updated")
}
Expand All @@ -454,15 +444,10 @@ func (nginx *Controller) UpdateConfigVersionFile() {
}

if !nginx.local {
w, err := os.Create(tempname)
err := createFileAndWrite(tempname, cfg)
if err != nil {
glog.Fatalf("Failed to open %v: %v", filename, err)
glog.Fatalf("%v", err.Error())
}
_, err = w.Write(cfg)
if err != nil {
glog.Fatalf("Failed to write to %v: %v", filename, err)
}
w.Close()

err = os.Rename(tempname, filename)
if err != nil {
Expand All @@ -471,3 +456,19 @@ func (nginx *Controller) UpdateConfigVersionFile() {
}
glog.V(3).Infof("The config version file has been updated.")
}

func createFileAndWrite(name string, b []byte) error {
w, err := os.Create(name)
if err != nil {
return fmt.Errorf("Failed to open %v: %v", name, err)
}

defer w.Close()

_, err = w.Write(b)
if err != nil {
return fmt.Errorf("Failed to write to %v: %v", name, err)
}

return nil
}

0 comments on commit baf72e2

Please sign in to comment.