Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-27 13:49:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2359 from ywk253100/170523_log

Browse Source 
Refactor log API
This commit is contained in:
Wenkai Yin 2017-05-24 18:32:44 +08:00 committed by GitHub
commit 79e80aad67
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ui/api/log.go
View File

@ -19,7 +19,6 @@ import (
"strconv"
"time"
"github.com/vmware/harbor/src/common/api"
"github.com/vmware/harbor/src/common/dao"
"github.com/vmware/harbor/src/common/models"
"github.com/vmware/harbor/src/common/utils/log"
@ -27,13 +26,16 @@ import (
//LogAPI handles request api/logs
type LogAPI struct {
api.BaseAPI
userID int
BaseController
}
//Prepare validates the URL and the user
func (l *LogAPI) Prepare() {
l.userID = l.ValidateUser()
l.BaseController.Prepare()
if !l.SecurityCtx.IsAuthenticated() {
l.HandleUnauthorized()
return
}
}
//Get returns the recent logs according to parameters
@ -75,16 +77,8 @@ func (l *LogAPI) Get() {
linesNum = 10
}
user, err := dao.GetUser(models.User{
UserID: l.userID,
})
if err != nil {
log.Errorf("failed to get user by user ID %d: %v", l.userID, err)
l.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
var logList []models.AccessLog
logList, err = dao.GetRecentLogs(user.Username, linesNum, startTime, endTime)
logList, err = dao.GetRecentLogs(l.SecurityCtx.GetUsername(), linesNum, startTime, endTime)
if err != nil {
log.Errorf("Get recent logs error, err: %v", err)
l.CustomAbort(http.StatusInternalServerError, "Internal error")