Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-26 04:05:40 +01:00
Code Issues Projects Releases Wiki Activity

Use new logger

Browse Source
This commit is contained in:
victoriazhengwf 2016-03-24 23:55:53 -07:00
parent 82899e9731
commit e1fa43178a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/base.go
View File

@ -17,12 +17,12 @@ package api
import ( import (
"encoding/json" "encoding/json"
"log"
"net/http" "net/http"
"github.com/vmware/harbor/auth" "github.com/vmware/harbor/auth"
"github.com/vmware/harbor/dao" "github.com/vmware/harbor/dao"
"github.com/vmware/harbor/models" "github.com/vmware/harbor/models"
log "github.com/vmware/harbor/utils/log"
"github.com/astaxie/beego" "github.com/astaxie/beego"
) )
@ -46,7 +46,7 @@ func (b *BaseAPI) RenderError(code int, text string) {
func (b *BaseAPI) DecodeJSONReq(v interface{}) { func (b *BaseAPI) DecodeJSONReq(v interface{}) {
err := json.Unmarshal(b.Ctx.Input.CopyBody(1<<32), v) err := json.Unmarshal(b.Ctx.Input.CopyBody(1<<32), v)
if err != nil { if err != nil {
beego.Error("Error while decoding the json request:", err) log.Errorf("Error while decoding the json request, error: %v", err)
b.CustomAbort(http.StatusBadRequest, "Invalid json request") b.CustomAbort(http.StatusBadRequest, "Invalid json request")
} }
} }
@ -56,10 +56,10 @@ func (b *BaseAPI) ValidateUser() int {
username, password, ok := b.Ctx.Request.BasicAuth() username, password, ok := b.Ctx.Request.BasicAuth()
if ok { if ok {
log.Printf("Requst with Basic Authentication header, username: %s", username) log.Infof("Requst with Basic Authentication header, username: %s", username)
user, err := auth.Login(models.AuthModel{username, password}) user, err := auth.Login(models.AuthModel{username, password})
if err != nil { if err != nil {
log.Printf("Error while trying to login, username: %s, error: %v", username, err) log.Errorf("Error while trying to login, username: %s, error: %v", username, err)
user = nil user = nil
} }
if user != nil { if user != nil {
@ -68,17 +68,17 @@ func (b *BaseAPI) ValidateUser() int {
} }
sessionUserID := b.GetSession("userId") sessionUserID := b.GetSession("userId")
if sessionUserID == nil { if sessionUserID == nil {
beego.Warning("No user id in session, canceling request") log.Warning("No user id in session, canceling request")
b.CustomAbort(http.StatusUnauthorized, "") b.CustomAbort(http.StatusUnauthorized, "")
} }
userID := sessionUserID.(int) userID := sessionUserID.(int)
u, err := dao.GetUser(models.User{UserID: userID}) u, err := dao.GetUser(models.User{UserID: userID})
if err != nil { if err != nil {
beego.Error("Error occurred in GetUser:", err) log.Errorf("Error occurred in GetUser, error: %v", err)
b.CustomAbort(http.StatusInternalServerError, "Internal error.") b.CustomAbort(http.StatusInternalServerError, "Internal error.")
} }
if u == nil { if u == nil {
beego.Warning("User was deleted already, user id: ", userID, " canceling request.") log.Warningf("User was deleted already, user id: %d ", userID, " canceling request.")
b.CustomAbort(http.StatusUnauthorized, "") b.CustomAbort(http.StatusUnauthorized, "")
} }
return userID return userID