Skip to content

Commit

Permalink
refactor logger in main.go & add harbor.cfg to .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
ywk253100 committed Mar 23, 2016
1 parent 171028a commit b3550cf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Deploy/config/registry/config.yml
Deploy/config/ui/env
Deploy/config/ui/app.conf
Deploy/config/db/env
Deploy/harbor.cfg
26 changes: 14 additions & 12 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package main

import (
"fmt"
"log"

log "github.com/vmware/harbor/log"

_ "github.com/vmware/harbor/auth/db"
_ "github.com/vmware/harbor/auth/ldap"
Expand All @@ -38,28 +39,27 @@ func updateInitPassword(userID int, password string) error {
queryUser := models.User{UserID: userID}
user, err := dao.GetUser(queryUser)
if err != nil {
log.Println("Failed to get user, userID:", userID)
return err
return fmt.Errorf("Failed to get user, userID: %d", userID)
}
if user == nil {
log.Printf("User id: %d does not exist.", userID)
return fmt.Errorf("User id: %d does not exist.", userID)
} else if user.Salt == "" {
}
if user.Salt == "" {
salt, err := dao.GenerateRandomString()
if err != nil {
log.Printf("Failed to generate salt for encrypting password, %v", err)
return err
return fmt.Errorf("Failed to generate salt for encrypting password, %v", err)
}

user.Salt = salt
user.Password = password
err = dao.ChangeUserPassword(*user)
if err != nil {
log.Printf("Failed to update user encrypted password, userID: %d, err: %v", userID, err)
return err
return fmt.Errorf("Failed to update user encrypted password, userID: %d, err: %v", userID, err)
}
log.Printf("User id: %d updated its encypted password successfully.", userID)

log.Infof("User id: %d updated its encypted password successfully.", userID)
} else {
log.Printf("User id: %d already has its encrypted password.", userID)
log.Infof("User id: %d already has its encrypted password.", userID)
}
return nil
}
Expand All @@ -68,6 +68,8 @@ func main() {

beego.BConfig.WebConfig.Session.SessionOn = true
dao.InitDB()
updateInitPassword(adminUserID, os.Getenv("HARBOR_ADMIN_PASSWORD"))
if err := updateInitPassword(adminUserID, os.Getenv("HARBOR_ADMIN_PASSWORD")); err != nil {
log.Error(err)
}
beego.Run()
}

0 comments on commit b3550cf

Please sign in to comment.