Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-23 05:15:06 +02:00
Code Issues Projects Releases Wiki Activity

refactor logger in main.go & add harbor.cfg to .gitignore

Browse Source
This commit is contained in:
Wenkai Yin 2016-03-23 13:15:27 +08:00
parent 171028aef5
commit b3550cf19b
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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
main.go
View File

@ -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"
@ -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
}
@ -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()
}