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

Minor log cleanup in prep for later changes

This commit is contained in:
Tim Hockin 2016-08-20 20:59:51 -07:00
parent 2d9dbf9fa6
commit 119465829f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main.go
View File

@ -96,21 +96,24 @@ func main() {
flag.Parse() flag.Parse()
if *flRepo == "" || *flDest == "" { if *flRepo == "" || *flDest == "" {
flag.Usage() flag.Usage()
log.Fatal(usage) os.Exit(1)
} }
if _, err := exec.LookPath("git"); err != nil { if _, err := exec.LookPath("git"); err != nil {
log.Fatalf("required git executable not found: %v", err) log.Printf("required git executable not found: %v", err)
os.Exit(1)
} }
if *flUsername != "" && *flPassword != "" { if *flUsername != "" && *flPassword != "" {
if err := setupGitAuth(*flUsername, *flPassword, *flRepo); err != nil { if err := setupGitAuth(*flUsername, *flPassword, *flRepo); err != nil {
log.Fatalf("error creating .netrc file: %v", err) log.Printf("error creating .netrc file: %v", err)
os.Exit(1)
} }
} }
if *flSSH { if *flSSH {
if err := setupGitSSH(); err != nil { if err := setupGitSSH(); err != nil {
log.Fatalf("error configuring SSH: %v", err) log.Printf("error configuring SSH: %v", err)
os.Exit(1)
} }
} }
@ -119,7 +122,8 @@ func main() {
for { for {
if err := syncRepo(*flRepo, *flRoot, *flDest, *flBranch, *flRev, *flDepth); err != nil { if err := syncRepo(*flRepo, *flRoot, *flDest, *flBranch, *flRev, *flDepth); err != nil {
if initialSync || failCount >= *flMaxSyncFailures { if initialSync || failCount >= *flMaxSyncFailures {
log.Fatalf("error syncing repo: %v", err) log.Printf("error syncing repo: %v", err)
os.Exit(1)
} }
failCount++ failCount++
@ -138,7 +142,6 @@ func main() {
log.Printf("waiting %d seconds", *flWait) log.Printf("waiting %d seconds", *flWait)
time.Sleep(time.Duration(*flWait) * time.Second) time.Sleep(time.Duration(*flWait) * time.Second)
log.Println("done")
} }
} }
@ -276,7 +279,7 @@ func syncRepo(repo, gitRoot, dest, branch, rev string, depth int) error {
return err return err
} }
if !needUpdate { if !needUpdate {
log.Printf("No change") log.Printf("no change")
return nil return nil
} }
} }