diff options
Diffstat (limited to 'server/ui/controller')
-rw-r--r-- | server/ui/controller/category.go | 10 | ||||
-rw-r--r-- | server/ui/controller/entry.go | 12 | ||||
-rw-r--r-- | server/ui/controller/feed.go | 6 | ||||
-rw-r--r-- | server/ui/controller/login.go | 10 | ||||
-rw-r--r-- | server/ui/controller/oauth2.go | 22 | ||||
-rw-r--r-- | server/ui/controller/opml.go | 12 | ||||
-rw-r--r-- | server/ui/controller/proxy.go | 4 | ||||
-rw-r--r-- | server/ui/controller/session.go | 5 | ||||
-rw-r--r-- | server/ui/controller/settings.go | 5 | ||||
-rw-r--r-- | server/ui/controller/static.go | 4 | ||||
-rw-r--r-- | server/ui/controller/subscription.go | 7 | ||||
-rw-r--r-- | server/ui/controller/user.go | 6 |
12 files changed, 52 insertions, 51 deletions
diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go index 747fca3..9bb12fb 100644 --- a/server/ui/controller/category.go +++ b/server/ui/controller/category.go @@ -6,8 +6,8 @@ package controller import ( "errors" - "log" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/ui/form" @@ -126,7 +126,7 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp category := model.Category{Title: categoryForm.Title, UserID: user.ID} err = c.store.CreateCategory(&category) if err != nil { - log.Println(err) + logger.Info("[Controller:CreateCategory] %v", err) response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": "Unable to create this category.", })) @@ -142,7 +142,7 @@ func (c *Controller) EditCategory(ctx *core.Context, request *core.Request, resp category, err := c.getCategoryFromURL(ctx, request, response) if err != nil { - log.Println(err) + logger.Error("[Controller:EditCategory] %v", err) return } @@ -161,7 +161,7 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re category, err := c.getCategoryFromURL(ctx, request, response) if err != nil { - log.Println(err) + logger.Error("[Controller:UpdateCategory] %v", err) return } @@ -188,7 +188,7 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re err = c.store.UpdateCategory(categoryForm.Merge(category)) if err != nil { - log.Println(err) + logger.Error("[Controller:UpdateCategory] %v", err) response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": "Unable to update this category.", })) diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go index 0873dc7..01a9ac5 100644 --- a/server/ui/controller/entry.go +++ b/server/ui/controller/entry.go @@ -6,8 +6,8 @@ package controller import ( "errors" - "log" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/reader/sanitizer" "github.com/miniflux/miniflux/integration" @@ -126,7 +126,7 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res if entry.Status == model.EntryStatusUnread { err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { - log.Println(err) + logger.Error("[Controller:ShowFeedEntry] %v", err) response.HTML().ServerError(nil) return } @@ -202,7 +202,7 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, if entry.Status == model.EntryStatusUnread { err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { - log.Println(err) + logger.Error("[Controller:ShowCategoryEntry] %v", err) response.HTML().ServerError(nil) return } @@ -297,7 +297,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r if entry.Status == model.EntryStatusUnread { err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { - log.Println(err) + logger.Error("[Controller:ShowUnreadEntry] %v", err) response.HTML().ServerError(nil) return } @@ -379,7 +379,7 @@ func (c *Controller) UpdateEntriesStatus(ctx *core.Context, request *core.Reques entryIDs, status, err := payload.DecodeEntryStatusPayload(request.Body()) if err != nil { - log.Println(err) + logger.Error("[Controller:UpdateEntryStatus] %v", err) response.JSON().BadRequest(nil) return } @@ -391,7 +391,7 @@ func (c *Controller) UpdateEntriesStatus(ctx *core.Context, request *core.Reques err = c.store.SetEntriesStatus(user.ID, entryIDs, status) if err != nil { - log.Println(err) + logger.Error("[Controller:UpdateEntryStatus] %v", err) response.JSON().ServerError(nil) return } diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go index 3bb7131..69596b8 100644 --- a/server/ui/controller/feed.go +++ b/server/ui/controller/feed.go @@ -6,8 +6,8 @@ package controller import ( "errors" - "log" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/ui/form" @@ -140,7 +140,7 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon err = c.store.UpdateFeed(feedForm.Merge(feed)) if err != nil { - log.Println(err) + logger.Error("[Controller:EditFeed] %v", err) response.HTML().Render("edit_feed", args.Merge(tplParams{ "errorMessage": "Unable to update this feed.", })) @@ -177,7 +177,7 @@ func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, respo user := ctx.LoggedUser() if err := c.feedHandler.RefreshFeed(user.ID, feedID); err != nil { - log.Println("[UI:RefreshFeed]", err) + logger.Error("[Controller:RefreshFeed] %v", err) } response.Redirect(ctx.Route("feedEntries", "feedID", feedID)) diff --git a/server/ui/controller/login.go b/server/ui/controller/login.go index d4f0f9c..9570403 100644 --- a/server/ui/controller/login.go +++ b/server/ui/controller/login.go @@ -5,10 +5,10 @@ package controller import ( - "log" "net/http" "time" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/ui/form" @@ -36,13 +36,13 @@ func (c *Controller) CheckLogin(ctx *core.Context, request *core.Request, respon } if err := authForm.Validate(); err != nil { - log.Println(err) + logger.Error("[Controller:CheckLogin] %v", err) response.HTML().Render("login", tplParams) return } if err := c.store.CheckPassword(authForm.Username, authForm.Password); err != nil { - log.Println(err) + logger.Error("[Controller:CheckLogin] %v", err) response.HTML().Render("login", tplParams) return } @@ -58,7 +58,7 @@ func (c *Controller) CheckLogin(ctx *core.Context, request *core.Request, respon return } - log.Printf("[UI:CheckLogin] username=%s just logged in\n", authForm.Username) + logger.Info("[Controller:CheckLogin] username=%s just logged in", authForm.Username) cookie := &http.Cookie{ Name: "sessionID", @@ -78,7 +78,7 @@ func (c *Controller) Logout(ctx *core.Context, request *core.Request, response * sessionCookie := request.Cookie("sessionID") if err := c.store.RemoveSessionByToken(user.ID, sessionCookie); err != nil { - log.Printf("[UI:Logout] %v", err) + logger.Error("[Controller:Logout] %v", err) } cookie := &http.Cookie{ diff --git a/server/ui/controller/oauth2.go b/server/ui/controller/oauth2.go index fdac30d..5c5d268 100644 --- a/server/ui/controller/oauth2.go +++ b/server/ui/controller/oauth2.go @@ -5,10 +5,10 @@ package controller import ( - "log" "net/http" "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/oauth2" @@ -19,14 +19,14 @@ import ( func (c *Controller) OAuth2Redirect(ctx *core.Context, request *core.Request, response *core.Response) { provider := request.StringParam("provider", "") if provider == "" { - log.Println("[OAuth2] Invalid or missing provider") + logger.Error("[OAuth2] Invalid or missing provider") response.Redirect(ctx.Route("login")) return } authProvider, err := getOAuth2Manager(c.cfg).Provider(provider) if err != nil { - log.Println("[OAuth2]", err) + logger.Error("[OAuth2] %v", err) response.Redirect(ctx.Route("login")) return } @@ -38,35 +38,35 @@ func (c *Controller) OAuth2Redirect(ctx *core.Context, request *core.Request, re func (c *Controller) OAuth2Callback(ctx *core.Context, request *core.Request, response *core.Response) { provider := request.StringParam("provider", "") if provider == "" { - log.Println("[OAuth2] Invalid or missing provider") + logger.Error("[OAuth2] Invalid or missing provider") response.Redirect(ctx.Route("login")) return } code := request.QueryStringParam("code", "") if code == "" { - log.Println("[OAuth2] No code received on callback") + logger.Error("[OAuth2] No code received on callback") response.Redirect(ctx.Route("login")) return } state := request.QueryStringParam("state", "") if state != ctx.CsrfToken() { - log.Println("[OAuth2] Invalid state value") + logger.Error("[OAuth2] Invalid state value") response.Redirect(ctx.Route("login")) return } authProvider, err := getOAuth2Manager(c.cfg).Provider(provider) if err != nil { - log.Println("[OAuth2]", err) + logger.Error("[OAuth2] %v", err) response.Redirect(ctx.Route("login")) return } profile, err := authProvider.GetProfile(code) if err != nil { - log.Println("[OAuth2]", err) + logger.Error("[OAuth2] %v", err) response.Redirect(ctx.Route("login")) return } @@ -116,7 +116,7 @@ func (c *Controller) OAuth2Callback(ctx *core.Context, request *core.Request, re return } - log.Printf("[UI:OAuth2Callback] username=%s just logged in\n", user.Username) + logger.Info("[Controller:OAuth2Callback] username=%s just logged in", user.Username) cookie := &http.Cookie{ Name: "sessionID", @@ -134,14 +134,14 @@ func (c *Controller) OAuth2Callback(ctx *core.Context, request *core.Request, re func (c *Controller) OAuth2Unlink(ctx *core.Context, request *core.Request, response *core.Response) { provider := request.StringParam("provider", "") if provider == "" { - log.Println("[OAuth2] Invalid or missing provider") + logger.Info("[OAuth2] Invalid or missing provider") response.Redirect(ctx.Route("login")) return } authProvider, err := getOAuth2Manager(c.cfg).Provider(provider) if err != nil { - log.Println("[OAuth2]", err) + logger.Error("[OAuth2] %v", err) response.Redirect(ctx.Route("settings")) return } diff --git a/server/ui/controller/opml.go b/server/ui/controller/opml.go index cf0e685..d801677 100644 --- a/server/ui/controller/opml.go +++ b/server/ui/controller/opml.go @@ -5,8 +5,7 @@ package controller import ( - "log" - + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/core" ) @@ -39,14 +38,19 @@ func (c *Controller) Import(ctx *core.Context, request *core.Request, response * func (c *Controller) UploadOPML(ctx *core.Context, request *core.Request, response *core.Response) { file, fileHeader, err := request.File("file") if err != nil { - log.Println(err) + logger.Error("[Controller:UploadOPML] %v", err) response.Redirect(ctx.Route("import")) return } defer file.Close() user := ctx.LoggedUser() - log.Printf("[UI:UploadOPML] User #%d uploaded this file: %s (%d bytes)\n", user.ID, fileHeader.Filename, fileHeader.Size) + logger.Info( + "[Controller:UploadOPML] User #%d uploaded this file: %s (%d bytes)", + user.ID, + fileHeader.Filename, + fileHeader.Size, + ) if impErr := c.opmlHandler.Import(user.ID, file); impErr != nil { args, err := c.getCommonTemplateArgs(ctx) diff --git a/server/ui/controller/proxy.go b/server/ui/controller/proxy.go index 6c85bc2..b44eddc 100644 --- a/server/ui/controller/proxy.go +++ b/server/ui/controller/proxy.go @@ -8,11 +8,11 @@ import ( "encoding/base64" "errors" "io/ioutil" - "log" "time" "github.com/miniflux/miniflux/helper" "github.com/miniflux/miniflux/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/core" ) @@ -39,7 +39,7 @@ func (c *Controller) ImageProxy(ctx *core.Context, request *core.Request, respon client := http.NewClient(string(decodedURL)) resp, err := client.Get() if err != nil { - log.Println("[ImageProxy]", err) + logger.Error("[Controller:ImageProxy] %v", err) response.HTML().NotFound() return } diff --git a/server/ui/controller/session.go b/server/ui/controller/session.go index 447e47a..bc5d5e9 100644 --- a/server/ui/controller/session.go +++ b/server/ui/controller/session.go @@ -5,8 +5,7 @@ package controller import ( - "log" - + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/core" ) @@ -45,7 +44,7 @@ func (c *Controller) RemoveSession(ctx *core.Context, request *core.Request, res err = c.store.RemoveSessionByID(user.ID, sessionID) if err != nil { - log.Println("[UI:RemoveSession]", err) + logger.Error("[Controller:RemoveSession] %v", err) } response.Redirect(ctx.Route("sessions")) diff --git a/server/ui/controller/settings.go b/server/ui/controller/settings.go index 7011378..af7558a 100644 --- a/server/ui/controller/settings.go +++ b/server/ui/controller/settings.go @@ -5,9 +5,8 @@ package controller import ( - "log" - "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/ui/form" @@ -55,7 +54,7 @@ func (c *Controller) UpdateSettings(ctx *core.Context, request *core.Request, re err = c.store.UpdateUser(settingsForm.Merge(user)) if err != nil { - log.Println(err) + logger.Error("[Controller:UpdateSettings] %v", err) response.HTML().Render("settings", args.Merge(tplParams{ "form": settingsForm, "errorMessage": "Unable to update this user.", diff --git a/server/ui/controller/static.go b/server/ui/controller/static.go index 2113808..0ad5548 100644 --- a/server/ui/controller/static.go +++ b/server/ui/controller/static.go @@ -6,9 +6,9 @@ package controller import ( "encoding/base64" - "log" "time" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/static" ) @@ -36,7 +36,7 @@ func (c *Controller) Javascript(ctx *core.Context, request *core.Request, respon func (c *Controller) Favicon(ctx *core.Context, request *core.Request, response *core.Response) { blob, err := base64.StdEncoding.DecodeString(static.Binaries["favicon.ico"]) if err != nil { - log.Println(err) + logger.Error("[Controller:Favicon] %v", err) response.HTML().NotFound() return } diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index 362856a..d243f9a 100644 --- a/server/ui/controller/subscription.go +++ b/server/ui/controller/subscription.go @@ -5,8 +5,7 @@ package controller import ( - "log" - + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/reader/subscription" "github.com/miniflux/miniflux/server/core" @@ -62,7 +61,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request subscriptions, err := subscription.FindSubscriptions(subscriptionForm.URL) if err != nil { - log.Println(err) + logger.Error("[Controller:SubmitSubscription] %v", err) response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, @@ -70,7 +69,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request return } - log.Println("[UI:SubmitSubscription]", subscriptions) + logger.Info("[UI:SubmitSubscription] %s", subscriptions) n := len(subscriptions) switch { diff --git a/server/ui/controller/user.go b/server/ui/controller/user.go index 8401958..c5d4dba 100644 --- a/server/ui/controller/user.go +++ b/server/ui/controller/user.go @@ -6,8 +6,8 @@ package controller import ( "errors" - "log" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/server/ui/form" @@ -97,7 +97,7 @@ func (c *Controller) SaveUser(ctx *core.Context, request *core.Request, response newUser := userForm.ToUser() if err := c.store.CreateUser(newUser); err != nil { - log.Println(err) + logger.Error("[Controller:SaveUser] %v", err) response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "form": userForm, @@ -182,7 +182,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon userForm.Merge(selectedUser) if err := c.store.UpdateUser(selectedUser); err != nil { - log.Println(err) + logger.Error("[Controller:UpdateUser] %v", err) response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "selected_user": selectedUser, |