mirrors
/
miniflux-v2
mirror of https://github.com/miniflux/v2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve logging messages in ui package

This commit is contained in:
Frédéric Guillot 2018-11-11 11:40:40 -08:00
parent 5a69a61d48
commit ca45765c46
13 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/category_save.go
View File

@ -58,7 +58,7 @@ func (h *handler) saveCategory(w http.ResponseWriter, r *http.Request) {
}
if err = h.store.CreateCategory(&category); err != nil {
logger.Error("[Controller:CreateCategory] %v", err)
logger.Error("[UI:SaveCategory] %v", err)
view.Set("errorMessage", "error.unable_to_create_category")
html.OK(w, r, view.Render("create_category"))
return

2
ui/category_update.go
View File

@ -60,7 +60,7 @@ func (h *handler) updateCategory(w http.ResponseWriter, r *http.Request) {
err = h.store.UpdateCategory(categoryForm.Merge(category))
if err != nil {
logger.Error("[Controller:UpdateCategory] %v", err)
logger.Error("[UI:UpdateCategory] %v", err)
view.Set("errorMessage", "error.unable_to_update_category")
html.OK(w, r, view.Render("edit_category"))
return

2
ui/entry_search.go
View File

@ -10,7 +10,6 @@ import (
"miniflux.app/http/request"
"miniflux.app/http/response/html"
"miniflux.app/http/route"
"miniflux.app/logger"
"miniflux.app/model"
"miniflux.app/storage"
"miniflux.app/ui/session"
@ -45,7 +44,6 @@ func (h *handler) showSearchEntryPage(w http.ResponseWriter, r *http.Request) {
if entry.Status == model.EntryStatusUnread {
err = h.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead)
if err != nil {
logger.Error("[Controller:ShowSearchEntry] %v", err)
html.ServerError(w, r, err)
return
}

2
ui/feed_refresh.go
View File

@ -16,7 +16,7 @@ import (
func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
feedID := request.RouteInt64Param(r, "feedID")
if err := h.feedHandler.RefreshFeed(request.UserID(r), feedID); err != nil {
logger.Error("[Controller:RefreshFeed] %v", err)
logger.Error("[UI:RefreshFeed] %v", err)
}
html.Redirect(w, r, route.Path(h.router, "feedEntries", "feedID", feedID))

2
ui/feed_update.go
View File

@ -63,7 +63,7 @@ func (h *handler) updateFeed(w http.ResponseWriter, r *http.Request) {
err = h.store.UpdateFeed(feedForm.Merge(feed))
if err != nil {
logger.Error("[Controller:EditFeed] %v", err)
logger.Error("[UI:UpdateFeed] %v", err)
view.Set("errorMessage", "error.unable_to_update_feed")
html.OK(w, r, view.Render("edit_feed"))
return

6
ui/login_check.go
View File

@ -23,13 +23,13 @@ func (h *handler) checkLogin(w http.ResponseWriter, r *http.Request) {
view.Set("form", authForm)
if err := authForm.Validate(); err != nil {
logger.Error("[Controller:CheckLogin] %v", err)
logger.Error("[UI:CheckLogin] %v", err)
html.OK(w, r, view.Render("login"))
return
}
if err := h.store.CheckPassword(authForm.Username, authForm.Password); err != nil {
logger.Error("[Controller:CheckLogin] [ClientIP=%s] %v", clientIP, err)
logger.Error("[UI:CheckLogin] [ClientIP=%s] %v", clientIP, err)
html.OK(w, r, view.Render("login"))
return
}
@ -40,7 +40,7 @@ func (h *handler) checkLogin(w http.ResponseWriter, r *http.Request) {
return
}
logger.Info("[Controller:CheckLogin] username=%s just logged in", authForm.Username)
logger.Info("[UI:CheckLogin] username=%s just logged in", authForm.Username)
h.store.SetLastLogin(userID)
user, err := h.store.UserByID(userID)

2
ui/logout.go
View File

@ -27,7 +27,7 @@ func (h *handler) logout(w http.ResponseWriter, r *http.Request) {
sess.SetTheme(user.Theme)
if err := h.store.RemoveUserSessionByToken(user.ID, request.UserSessionToken(r)); err != nil {
logger.Error("[Controller:Logout] %v", err)
logger.Error("[UI:Logout] %v", err)
}
http.SetCookie(w, cookie.Expired(

14
ui/middleware.go
View File

@ -36,14 +36,14 @@ func (m *middleware) handleUserSession(next http.Handler) http.Handler {
session := m.getUserSessionFromCookie(r)
if session == nil {
logger.Debug("[UserSession] Session not found")
if m.isPublicRoute(r) {
next.ServeHTTP(w, r)
} else {
logger.Debug("[UI:UserSession] Session not found, redirect to login page")
html.Redirect(w, r, route.Path(m.router, "login"))
}
} else {
logger.Debug("[UserSession] %s", session)
logger.Debug("[UI:UserSession] %s", session)
ctx := r.Context()
ctx = context.WithValue(ctx, request.UserIDContextKey, session.UserID)
@ -61,7 +61,7 @@ func (m *middleware) handleAppSession(next http.Handler) http.Handler {
session := m.getAppSessionValueFromCookie(r)
if session == nil {
logger.Debug("[AppSession] Session not found")
logger.Debug("[UI:AppSession] Session not found")
session, err = m.store.CreateSession()
if err != nil {
@ -71,7 +71,7 @@ func (m *middleware) handleAppSession(next http.Handler) http.Handler {
http.SetCookie(w, cookie.New(cookie.CookieSessionID, session.ID, m.cfg.IsHTTPS, m.cfg.BasePath()))
} else {
logger.Debug("[AppSession] %s", session)
logger.Debug("[UI:AppSession] %s", session)
}
if r.Method == "POST" {
@ -79,7 +79,7 @@ func (m *middleware) handleAppSession(next http.Handler) http.Handler {
headerValue := r.Header.Get("X-Csrf-Token")
if session.Data.CSRF != formValue && session.Data.CSRF != headerValue {
logger.Error(`[AppSession] Invalid or missing CSRF token: Form="%s", Header="%s"`, formValue, headerValue)
logger.Error(`[UI:AppSession] Invalid or missing CSRF token: Form="%s", Header="%s"`, formValue, headerValue)
html.BadRequest(w, r, errors.New("Invalid or missing CSRF"))
return
}
@ -106,7 +106,7 @@ func (m *middleware) getAppSessionValueFromCookie(r *http.Request) *model.Sessio
session, err := m.store.Session(cookieValue)
if err != nil {
logger.Error("[AppSession] %v", err)
logger.Error("[UI:AppSession] %v", err)
return nil
}
@ -141,7 +141,7 @@ func (m *middleware) getUserSessionFromCookie(r *http.Request) *model.UserSessio
session, err := m.store.UserSessionByToken(cookieValue)
if err != nil {
logger.Error("[UserSession] %v", err)
logger.Error("[UI:UserSession] %v", err)
return nil
}

6
ui/opml_upload.go
View File

@ -25,14 +25,14 @@ func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) {
file, fileHeader, err := r.FormFile("file")
if err != nil {
logger.Error("[Controller:UploadOPML] %v", err)
logger.Error("[UI:UploadOPML] %v", err)
html.Redirect(w, r, route.Path(h.router, "import"))
return
}
defer file.Close()
logger.Info(
"[Controller:UploadOPML] User #%d uploaded this file: %s (%d bytes)",
logger.Debug(
"[UI:UploadOPML] User #%d uploaded this file: %s (%d bytes)",
user.ID,
fileHeader.Filename,
fileHeader.Size,

2
ui/session_remove.go
View File

@ -17,7 +17,7 @@ func (h *handler) removeSession(w http.ResponseWriter, r *http.Request) {
sessionID := request.RouteInt64Param(r, "sessionID")
err := h.store.RemoveUserSessionByID(request.UserID(r), sessionID)
if err != nil {
logger.Error("[Controller:RemoveSession] %v", err)
logger.Error("[UI:RemoveSession] %v", err)
}
html.Redirect(w, r, route.Path(h.router, "sessions"))

2
ui/settings_update.go
View File

@ -59,7 +59,7 @@ func (h *handler) updateSettings(w http.ResponseWriter, r *http.Request) {
err = h.store.UpdateUser(settingsForm.Merge(user))
if err != nil {
logger.Error("[Controller:UpdateSettings] %v", err)
logger.Error("[UI:UpdateSettings] %v", err)
view.Set("errorMessage", "error.unable_to_update_user")
html.OK(w, r, view.Render("settings"))
return

2
ui/user_save.go
View File

@ -52,7 +52,7 @@ func (h *handler) saveUser(w http.ResponseWriter, r *http.Request) {
newUser := userForm.ToUser()
if err := h.store.CreateUser(newUser); err != nil {
logger.Error("[Controller:SaveUser] %v", err)
logger.Error("[UI:SaveUser] %v", err)
view.Set("errorMessage", "error.unable_to_create_user")
html.OK(w, r, view.Render("create_user"))
return

2
ui/user_update.go
View File

@ -65,7 +65,7 @@ func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) {
userForm.Merge(selectedUser)
if err := h.store.UpdateUser(selectedUser); err != nil {
logger.Error("[Controller:UpdateUser] %v", err)
logger.Error("[UI:UpdateUser] %v", err)
view.Set("errorMessage", "error.unable_to_update_user")
html.OK(w, r, view.Render("edit_user"))
return