mirror of
https://github.com/goharbor/harbor.git
synced 2024-10-27 13:49:34 +01:00
refactor log API
This commit is contained in:
parent
1c441b17be
commit
e8572545c1
@ -19,7 +19,6 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/vmware/harbor/src/common/api"
|
|
||||||
"github.com/vmware/harbor/src/common/dao"
|
"github.com/vmware/harbor/src/common/dao"
|
||||||
"github.com/vmware/harbor/src/common/models"
|
"github.com/vmware/harbor/src/common/models"
|
||||||
"github.com/vmware/harbor/src/common/utils/log"
|
"github.com/vmware/harbor/src/common/utils/log"
|
||||||
@ -27,13 +26,16 @@ import (
|
|||||||
|
|
||||||
//LogAPI handles request api/logs
|
//LogAPI handles request api/logs
|
||||||
type LogAPI struct {
|
type LogAPI struct {
|
||||||
api.BaseAPI
|
BaseController
|
||||||
userID int
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Prepare validates the URL and the user
|
//Prepare validates the URL and the user
|
||||||
func (l *LogAPI) Prepare() {
|
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
|
//Get returns the recent logs according to parameters
|
||||||
@ -75,16 +77,8 @@ func (l *LogAPI) Get() {
|
|||||||
linesNum = 10
|
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
|
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 {
|
if err != nil {
|
||||||
log.Errorf("Get recent logs error, err: %v", err)
|
log.Errorf("Get recent logs error, err: %v", err)
|
||||||
l.CustomAbort(http.StatusInternalServerError, "Internal error")
|
l.CustomAbort(http.StatusInternalServerError, "Internal error")
|
||||||
|
Loading…
Reference in New Issue
Block a user