Skip to content

Commit 8da1b31

Browse files
qinpengfeifeifeiiiiiiiiiii
andcommitted
refactor write config
Signed-off-by: qinpengfei <[email protected]> refactor func AddOrUpdateDHParam && add more context to log message Signed-off-by: qinpengfei <[email protected]> remove unnecessary log Signed-off-by: qinpengfei <[email protected]> fix log message Co-Authored-By: feifeiiiiiiiiiii <[email protected]> fix log message Co-Authored-By: feifeiiiiiiiiiii <[email protected]>
1 parent 5324967 commit 8da1b31

File tree

1 file changed

+24
-29
lines changed

1 file changed

+24
-29
lines changed

internal/nginx/nginx.go

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,9 @@ func (nginx *Controller) DeleteIngress(name string) {
230230
func (nginx *Controller) AddOrUpdateDHParam(dhparam string) (string, error) {
231231
fileName := nginx.nginxSecretsPath + "/" + dhparamFilename
232232
if !nginx.local {
233-
pem, err := os.Create(fileName)
233+
err := createFileAndWrite(fileName, []byte(dhparam))
234234
if err != nil {
235-
return fileName, fmt.Errorf("Couldn't create file %v: %v", fileName, err)
236-
}
237-
defer pem.Close()
238-
239-
_, err = pem.WriteString(dhparam)
240-
if err != nil {
241-
return fileName, fmt.Errorf("Couldn't write to pem file %v: %v", fileName, err)
235+
return fileName, fmt.Errorf("Failed to write pem file: %v", err)
242236
}
243237
}
244238
return fileName, nil
@@ -402,15 +396,10 @@ func (nginx *Controller) UpdateMainConfigFile(cfg []byte) {
402396
}
403397

404398
if !nginx.local {
405-
w, err := os.Create(filename)
406-
if err != nil {
407-
glog.Fatalf("Failed to open %v: %v", filename, err)
408-
}
409-
_, err = w.Write(cfg)
399+
err := createFileAndWrite(filename, cfg)
410400
if err != nil {
411-
glog.Fatalf("Failed to write to %v: %v", filename, err)
401+
glog.Fatalf("Failed to write NGINX conf: %v", err)
412402
}
413-
defer w.Close()
414403
}
415404
glog.V(3).Infof("The main NGINX config file has been updated")
416405
}
@@ -425,15 +414,10 @@ func (nginx *Controller) UpdateIngressConfigFile(name string, cfg []byte) {
425414
}
426415

427416
if !nginx.local {
428-
w, err := os.Create(filename)
417+
err := createFileAndWrite(filename, cfg)
429418
if err != nil {
430-
glog.Fatalf("Failed to open %v: %v", filename, err)
419+
glog.Fatalf("Failed to write Ingress conf: %v", err)
431420
}
432-
_, err = w.Write(cfg)
433-
if err != nil {
434-
glog.Fatalf("Failed to write to %v: %v", filename, err)
435-
}
436-
defer w.Close()
437421
}
438422
glog.V(3).Infof("The Ingress config file has been updated")
439423
}
@@ -454,15 +438,10 @@ func (nginx *Controller) UpdateConfigVersionFile() {
454438
}
455439

456440
if !nginx.local {
457-
w, err := os.Create(tempname)
441+
err := createFileAndWrite(tempname, cfg)
458442
if err != nil {
459-
glog.Fatalf("Failed to open %v: %v", filename, err)
443+
glog.Fatalf("Failed to write version config file: %v", err)
460444
}
461-
_, err = w.Write(cfg)
462-
if err != nil {
463-
glog.Fatalf("Failed to write to %v: %v", filename, err)
464-
}
465-
w.Close()
466445

467446
err = os.Rename(tempname, filename)
468447
if err != nil {
@@ -471,3 +450,19 @@ func (nginx *Controller) UpdateConfigVersionFile() {
471450
}
472451
glog.V(3).Infof("The config version file has been updated.")
473452
}
453+
454+
func createFileAndWrite(name string, b []byte) error {
455+
w, err := os.Create(name)
456+
if err != nil {
457+
return fmt.Errorf("Failed to open %v: %v", name, err)
458+
}
459+
460+
defer w.Close()
461+
462+
_, err = w.Write(b)
463+
if err != nil {
464+
return fmt.Errorf("Failed to write to %v: %v", name, err)
465+
}
466+
467+
return nil
468+
}

0 commit comments

Comments
 (0)