kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up global flRoot use

This commit is contained in:
Tim Hockin 2021-05-21 16:57:57 -07:00
parent 53e0c0d9fd
commit 295cfd442d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/git-sync/main.go
View File

@ -183,6 +183,7 @@ const (
type customLogger struct { type customLogger struct {
logr.Logger logr.Logger
root string
errorFile string errorFile string
} }
@ -230,16 +231,16 @@ func (l *customLogger) exportError(content string) {
// writeContent writes the error content to the error file. // writeContent writes the error content to the error file.
func (l *customLogger) writeContent(content []byte) { func (l *customLogger) writeContent(content []byte) {
if _, err := os.Stat(*flRoot); os.IsNotExist(err) { if _, err := os.Stat(l.root); os.IsNotExist(err) {
fileMode := os.FileMode(0755) fileMode := os.FileMode(0755)
if err := os.Mkdir(*flRoot, fileMode); err != nil { if err := os.Mkdir(l.root, fileMode); err != nil {
l.Logger.Error(err, "can't create the root directory", "root", *flRoot) l.Logger.Error(err, "can't create the root directory", "root", l.root)
return return
} }
} }
tmpFile, err := ioutil.TempFile(*flRoot, "tmp-err-") tmpFile, err := ioutil.TempFile(l.root, "tmp-err-")
if err != nil { if err != nil {
l.Logger.Error(err, "can't create temporary error-file", "directory", *flRoot, "prefix", "tmp-err-") l.Logger.Error(err, "can't create temporary error-file", "directory", l.root, "prefix", "tmp-err-")
return return
} }
defer func() { defer func() {
@ -253,8 +254,9 @@ func (l *customLogger) writeContent(content []byte) {
return return
} }
if err := os.Rename(tmpFile.Name(), l.errorFile); err != nil { errorFile := filepath.Join(l.root, l.errorFile)
l.Logger.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", l.errorFile) if err := os.Rename(tmpFile.Name(), errorFile); err != nil {
l.Logger.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", errorFile)
return return
} }
} }
@ -264,11 +266,12 @@ func (l *customLogger) deleteErrorFile() {
if l.errorFile == "" { if l.errorFile == "" {
return return
} }
if err := os.Remove(l.errorFile); err != nil { errorFile := filepath.Join(l.root, l.errorFile)
if err := os.Remove(errorFile); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return return
} }
l.Logger.Error(err, "can't delete the error-file", "filename", l.errorFile) l.Logger.Error(err, "can't delete the error-file", "filename", errorFile)
} }
} }
@ -385,11 +388,7 @@ func main() {
flag.CommandLine.Parse(nil) // Otherwise glog complains flag.CommandLine.Parse(nil) // Otherwise glog complains
setGlogFlags() setGlogFlags()
var errorFile string log = &customLogger{glogr.New(), *flRoot, *flErrorFile}
if *flErrorFile != "" {
errorFile = filepath.Join(*flRoot, *flErrorFile)
}
log = &customLogger{glogr.New(), errorFile}
if *flVersion { if *flVersion {
fmt.Println(version.VERSION) fmt.Println(version.VERSION)