Improve logging messages in ui package

13 files changed, 22 insertions, 24 deletions

diff --git a/ui/category_save.go b/ui/category_save.go
index dd71528..48fe4b6 100644
--- a/ui/category_save.go
+++ b/ui/category_save.go
@@ -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
diff --git a/ui/category_update.go b/ui/category_update.go
index 1d20648..026f991 100644
--- a/ui/category_update.go
+++ b/ui/category_update.go
@@ -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
diff --git a/ui/entry_search.go b/ui/entry_search.go
index 252b306..d995533 100644
--- a/ui/entry_search.go
+++ b/ui/entry_search.go
@@ -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
 		}
diff --git a/ui/feed_refresh.go b/ui/feed_refresh.go
index 1b9dc3c..3c818e7 100644
--- a/ui/feed_refresh.go
+++ b/ui/feed_refresh.go
@@ -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))
diff --git a/ui/feed_update.go b/ui/feed_update.go
index 936fd1f..a5d830e 100644
--- a/ui/feed_update.go
+++ b/ui/feed_update.go
@@ -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
diff --git a/ui/login_check.go b/ui/login_check.go
index acc762a..46229a4 100644
--- a/ui/login_check.go
+++ b/ui/login_check.go
@@ -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)
diff --git a/ui/logout.go b/ui/logout.go
index ecb08b9..7c63c32 100644
--- a/ui/logout.go
+++ b/ui/logout.go
@@ -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(
diff --git a/ui/middleware.go b/ui/middleware.go
index 6ec68ee..237432a 100644
--- a/ui/middleware.go
+++ b/ui/middleware.go
@@ -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
 	}
 
diff --git a/ui/opml_upload.go b/ui/opml_upload.go
index 82e2ac8..e5a9391 100644
--- a/ui/opml_upload.go
+++ b/ui/opml_upload.go
@@ -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,
diff --git a/ui/session_remove.go b/ui/session_remove.go
index e84a7a2..7e57b82 100644
--- a/ui/session_remove.go
+++ b/ui/session_remove.go
@@ -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"))
diff --git a/ui/settings_update.go b/ui/settings_update.go
index 3497dd9..d4103d6 100644
--- a/ui/settings_update.go
+++ b/ui/settings_update.go
@@ -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
diff --git a/ui/user_save.go b/ui/user_save.go
index f13ac0a..f1f6058 100644
--- a/ui/user_save.go
+++ b/ui/user_save.go
@@ -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
diff --git a/ui/user_update.go b/ui/user_update.go
index 85f1501..00b209d 100644
--- a/ui/user_update.go
+++ b/ui/user_update.go
@@ -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