diff options
Diffstat (limited to 'server')
30 files changed, 121 insertions, 120 deletions
diff --git a/server/core/context.go b/server/core/context.go index 0f064fe..50496b3 100644 --- a/server/core/context.go +++ b/server/core/context.go @@ -5,9 +5,9 @@ package core import ( - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/middleware" "github.com/miniflux/miniflux/server/route" @@ -63,11 +63,11 @@ func (c *Context) LoggedUser() *model.User { var err error c.user, err = c.store.UserByID(c.UserID()) if err != nil { - log.Fatalln(err) + logger.Fatal("[Context] %v", err) } if c.user == nil { - log.Fatalln("Unable to find user from context") + logger.Fatal("Unable to find user from context") } } @@ -86,7 +86,7 @@ func (c *Context) CsrfToken() string { return v.(string) } - log.Println("No CSRF token in context!") + logger.Error("No CSRF token in context!") return "" } diff --git a/server/core/handler.go b/server/core/handler.go index 809282e..c55cf79 100644 --- a/server/core/handler.go +++ b/server/core/handler.go @@ -5,12 +5,12 @@ package core import ( - "log" "net/http" "time" "github.com/miniflux/miniflux/helper" "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/middleware" "github.com/miniflux/miniflux/server/template" "github.com/miniflux/miniflux/storage" @@ -34,7 +34,7 @@ type Handler struct { func (h *Handler) Use(f HandlerFunc) http.Handler { return h.middleware.WrapFunc(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { defer helper.ExecutionTime(time.Now(), r.URL.Path) - log.Println(r.Method, r.URL.Path) + logger.Debug("[HTTP] %s %s", r.Method, r.URL.Path) ctx := NewContext(w, r, h.store, h.router) request := NewRequest(w, r) diff --git a/server/core/html_response.go b/server/core/html_response.go index 1b29ee8..be75c31 100644 --- a/server/core/html_response.go +++ b/server/core/html_response.go @@ -5,9 +5,9 @@ package core import ( - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/template" ) @@ -30,7 +30,7 @@ func (h *HTMLResponse) ServerError(err error) { h.writer.Header().Set("Content-Type", "text/html; charset=utf-8") if err != nil { - log.Println(err) + logger.Error("[Internal Server Error] %v", err) h.writer.Write([]byte("Internal Server Error: " + err.Error())) } else { h.writer.Write([]byte("Internal Server Error")) @@ -43,7 +43,7 @@ func (h *HTMLResponse) BadRequest(err error) { h.writer.Header().Set("Content-Type", "text/html; charset=utf-8") if err != nil { - log.Println(err) + logger.Error("[Bad Request] %v", err) h.writer.Write([]byte("Bad Request: " + err.Error())) } else { h.writer.Write([]byte("Bad Request")) diff --git a/server/core/json_response.go b/server/core/json_response.go index ed29d6a..f493454 100644 --- a/server/core/json_response.go +++ b/server/core/json_response.go @@ -7,8 +7,9 @@ package core import ( "encoding/json" "errors" - "log" "net/http" + + "github.com/miniflux/miniflux/logger" ) // JSONResponse handles JSON responses. @@ -39,7 +40,7 @@ func (j *JSONResponse) NoContent() { // BadRequest sends a JSON response with the status code 400. func (j *JSONResponse) BadRequest(err error) { - log.Println("[API:BadRequest]", err) + logger.Error("[Bad Request] %v", err) j.writer.WriteHeader(http.StatusBadRequest) j.commonHeaders() @@ -50,7 +51,7 @@ func (j *JSONResponse) BadRequest(err error) { // NotFound sends a JSON response with the status code 404. func (j *JSONResponse) NotFound(err error) { - log.Println("[API:NotFound]", err) + logger.Error("[Not Found] %v", err) j.writer.WriteHeader(http.StatusNotFound) j.commonHeaders() j.writer.Write(j.encodeError(err)) @@ -58,7 +59,7 @@ func (j *JSONResponse) NotFound(err error) { // ServerError sends a JSON response with the status code 500. func (j *JSONResponse) ServerError(err error) { - log.Println("[API:ServerError]", err) + logger.Error("[Internal Server Error] %v", err) j.writer.WriteHeader(http.StatusInternalServerError) j.commonHeaders() @@ -69,7 +70,7 @@ func (j *JSONResponse) ServerError(err error) { // Forbidden sends a JSON response with the status code 403. func (j *JSONResponse) Forbidden() { - log.Println("[API:Forbidden]") + logger.Info("[API:Forbidden]") j.writer.WriteHeader(http.StatusForbidden) j.commonHeaders() j.writer.Write(j.encodeError(errors.New("Access Forbidden"))) @@ -88,7 +89,7 @@ func (j *JSONResponse) encodeError(err error) []byte { tmp := errorMsg{ErrorMessage: err.Error()} data, err := json.Marshal(tmp) if err != nil { - log.Println("encodeError:", err) + logger.Error("encoding error: %v", err) } return data @@ -97,7 +98,7 @@ func (j *JSONResponse) encodeError(err error) []byte { func (j *JSONResponse) toJSON(v interface{}) []byte { b, err := json.Marshal(v) if err != nil { - log.Println("Unable to convert interface to JSON:", err) + logger.Error("encoding error: %v", err) return []byte("") } diff --git a/server/core/request.go b/server/core/request.go index 540b2ac..f21b808 100644 --- a/server/core/request.go +++ b/server/core/request.go @@ -7,12 +7,12 @@ package core import ( "fmt" "io" - "log" "mime/multipart" "net/http" "strconv" "github.com/gorilla/mux" + "github.com/miniflux/miniflux/logger" ) // Request is a thin wrapper around "http.Request". @@ -68,7 +68,7 @@ func (r *Request) IntegerParam(param string) (int64, error) { vars := mux.Vars(r.request) value, err := strconv.Atoi(vars[param]) if err != nil { - log.Println(err) + logger.Error("[IntegerParam] %v", err) return 0, fmt.Errorf("%s parameter is not an integer", param) } diff --git a/server/fever/fever.go b/server/fever/fever.go index b84813f..92d0fa0 100644 --- a/server/fever/fever.go +++ b/server/fever/fever.go @@ -5,12 +5,12 @@ package fever import ( - "log" "strconv" "strings" "time" "github.com/miniflux/miniflux/integration" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/core" "github.com/miniflux/miniflux/storage" @@ -183,7 +183,7 @@ is_spark equal to 1. */ func (c *Controller) handleGroups(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching groups for userID=%d\n", userID) + logger.Debug("[Fever] Fetching groups for userID=%d", userID) categories, err := c.store.Categories(userID) if err != nil { @@ -233,7 +233,7 @@ For the “Sparks” super group the items should be limited to feeds with an is */ func (c *Controller) handleFeeds(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching feeds for userID=%d\n", userID) + logger.Debug("[Fever] Fetching feeds for userID=%d", userID) feeds, err := c.store.Feeds(userID) if err != nil { @@ -280,7 +280,7 @@ A PHP/HTML example: */ func (c *Controller) handleFavicons(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching favicons for userID=%d\n", userID) + logger.Debug("[Fever] Fetching favicons for userID=%d", userID) icons, err := c.store.Icons(userID) if err != nil { @@ -336,7 +336,7 @@ func (c *Controller) handleItems(ctx *core.Context, request *core.Request, respo userID := ctx.UserID() timezone := ctx.UserTimezone() - log.Printf("[Fever] Fetching items for userID=%d\n", userID) + logger.Debug("[Fever] Fetching items for userID=%d", userID) builder := c.store.GetEntryQueryBuilder(userID, timezone) builder.WithoutStatus(model.EntryStatusRemoved) @@ -413,7 +413,7 @@ A request with the unread_item_ids argument will return one additional member: */ func (c *Controller) handleUnreadItems(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching unread items for userID=%d\n", userID) + logger.Debug("[Fever] Fetching unread items for userID=%d", userID) builder := c.store.GetEntryQueryBuilder(userID, ctx.UserTimezone()) builder.WithStatus(model.EntryStatusUnread) @@ -444,7 +444,7 @@ with the remote Fever installation. */ func (c *Controller) handleSavedItems(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching saved items for userID=%d\n", userID) + logger.Debug("[Fever] Fetching saved items for userID=%d", userID) var result savedResponse result.SetCommonValues() @@ -471,7 +471,7 @@ A link object has the following members: */ func (c *Controller) handleLinks(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Fetching links for userID=%d\n", userID) + logger.Debug("[Fever] Fetching links for userID=%d", userID) var result linksResponse result.SetCommonValues() @@ -485,7 +485,7 @@ func (c *Controller) handleLinks(ctx *core.Context, request *core.Request, respo */ func (c *Controller) handleWriteItems(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Receiving mark=item call for userID=%d\n", userID) + logger.Debug("[Fever] Receiving mark=item call for userID=%d", userID) entryID := request.FormIntegerValue("id") if entryID <= 0 { @@ -534,7 +534,7 @@ func (c *Controller) handleWriteItems(ctx *core.Context, request *core.Request, */ func (c *Controller) handleWriteFeeds(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Receiving mark=feed call for userID=%d\n", userID) + logger.Debug("[Fever] Receiving mark=feed call for userID=%d", userID) feedID := request.FormIntegerValue("id") if feedID <= 0 { @@ -574,7 +574,7 @@ func (c *Controller) handleWriteFeeds(ctx *core.Context, request *core.Request, */ func (c *Controller) handleWriteGroups(ctx *core.Context, request *core.Request, response *core.Response) { userID := ctx.UserID() - log.Printf("[Fever] Receiving mark=group call for userID=%d\n", userID) + logger.Debug("[Fever] Receiving mark=group call for userID=%d", userID) groupID := request.FormIntegerValue("id") if groupID < 0 { diff --git a/server/middleware/basic_auth.go b/server/middleware/basic_auth.go index 887acc0..c4a2736 100644 --- a/server/middleware/basic_auth.go +++ b/server/middleware/basic_auth.go @@ -6,9 +6,9 @@ package middleware import ( "context" - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/storage" ) @@ -25,14 +25,14 @@ func (b *BasicAuthMiddleware) Handler(next http.Handler) http.Handler { username, password, authOK := r.BasicAuth() if !authOK { - log.Println("[Middleware:BasicAuth] No authentication headers sent") + logger.Debug("[Middleware:BasicAuth] No authentication headers sent") w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(errorResponse)) return } if err := b.store.CheckPassword(username, password); err != nil { - log.Println("[Middleware:BasicAuth] Invalid username or password:", username) + logger.Info("[Middleware:BasicAuth] Invalid username or password: %s", username) w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(errorResponse)) return @@ -40,13 +40,13 @@ func (b *BasicAuthMiddleware) Handler(next http.Handler) http.Handler { user, err := b.store.UserByUsername(username) if err != nil || user == nil { - log.Println("[Middleware:BasicAuth] User not found:", username) + logger.Info("[Middleware:BasicAuth] User not found: %s", username) w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(errorResponse)) return } - log.Println("[Middleware:BasicAuth] User authenticated:", username) + logger.Info("[Middleware:BasicAuth] User authenticated: %s", username) b.store.SetLastLogin(user.ID) ctx := r.Context() diff --git a/server/middleware/fever.go b/server/middleware/fever.go index 7334d3d..54eb0ca 100644 --- a/server/middleware/fever.go +++ b/server/middleware/fever.go @@ -6,9 +6,9 @@ package middleware import ( "context" - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/storage" ) @@ -20,25 +20,25 @@ type FeverMiddleware struct { // Handler executes the middleware. func (f *FeverMiddleware) Handler(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - log.Println("[Middleware:Fever]") + logger.Debug("[Middleware:Fever]") apiKey := r.FormValue("api_key") user, err := f.store.UserByFeverToken(apiKey) if err != nil { - log.Println(err) + logger.Error("[Fever] %v", err) w.Header().Set("Content-Type", "application/json") w.Write([]byte(`{"api_version": 3, "auth": 0}`)) return } if user == nil { - log.Println("[Middleware:Fever] Fever authentication failure") + logger.Info("[Middleware:Fever] Fever authentication failure") w.Header().Set("Content-Type", "application/json") w.Write([]byte(`{"api_version": 3, "auth": 0}`)) return } - log.Printf("[Middleware:Fever] User #%d is authenticated\n", user.ID) + logger.Info("[Middleware:Fever] User #%d is authenticated", user.ID) f.store.SetLastLogin(user.ID) ctx := r.Context() diff --git a/server/middleware/session.go b/server/middleware/session.go index 2ef7151..edaa59b 100644 --- a/server/middleware/session.go +++ b/server/middleware/session.go @@ -6,9 +6,9 @@ package middleware import ( "context" - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/server/route" "github.com/miniflux/miniflux/storage" @@ -28,14 +28,14 @@ func (s *SessionMiddleware) Handler(next http.Handler) http.Handler { session := s.getSessionFromCookie(r) if session == nil { - log.Println("[Middleware:Session] Session not found") + logger.Debug("[Middleware:Session] Session not found") if s.isPublicRoute(r) { next.ServeHTTP(w, r) } else { http.Redirect(w, r, route.Path(s.router, "login"), http.StatusFound) } } else { - log.Println("[Middleware:Session]", session) + logger.Debug("[Middleware:Session] %s", session) ctx := r.Context() ctx = context.WithValue(ctx, UserIDContextKey, session.UserID) ctx = context.WithValue(ctx, IsAuthenticatedContextKey, true) @@ -63,7 +63,7 @@ func (s *SessionMiddleware) getSessionFromCookie(r *http.Request) *model.Session session, err := s.store.SessionByToken(sessionCookie.Value) if err != nil { - log.Println(err) + logger.Error("[SessionMiddleware] %v", err) return nil } diff --git a/server/middleware/token.go b/server/middleware/token.go index 5b24606..e1666f7 100644 --- a/server/middleware/token.go +++ b/server/middleware/token.go @@ -6,9 +6,9 @@ package middleware import ( "context" - "log" "net/http" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/storage" ) @@ -25,10 +25,10 @@ func (t *TokenMiddleware) Handler(next http.Handler) http.Handler { token := t.getTokenValueFromCookie(r) if token == nil { - log.Println("[Middleware:Token] Token not found") + logger.Debug("[Middleware:Token] Token not found") token, err = t.store.CreateToken() if err != nil { - log.Println(err) + logger.Error("[Middleware:Token] %v", err) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) return } @@ -43,13 +43,13 @@ func (t *TokenMiddleware) Handler(next http.Handler) http.Handler { http.SetCookie(w, cookie) } else { - log.Println("[Middleware:Token]", token) + logger.Info("[Middleware:Token] %s", token) } isTokenValid := token.Value == r.FormValue("csrf") || token.Value == r.Header.Get("X-Csrf-Token") if r.Method == "POST" && !isTokenValid { - log.Println("[Middleware:CSRF] Invalid or missing CSRF token!") + logger.Error("[Middleware:CSRF] Invalid or missing CSRF token!") w.WriteHeader(http.StatusBadRequest) w.Write([]byte("Invalid or missing CSRF token!")) } else { @@ -68,7 +68,7 @@ func (t *TokenMiddleware) getTokenValueFromCookie(r *http.Request) *model.Token token, err := t.store.Token(tokenCookie.Value) if err != nil { - log.Println(err) + logger.Error("[Middleware:Token] %v", err) return nil } diff --git a/server/route/route.go b/server/route/route.go index 06d095a..ee574a5 100644 --- a/server/route/route.go +++ b/server/route/route.go @@ -5,17 +5,17 @@ package route import ( - "log" "strconv" "github.com/gorilla/mux" + "github.com/miniflux/miniflux/logger" ) // Path returns the defined route based on given arguments. func Path(router *mux.Router, name string, args ...interface{}) string { route := router.Get(name) if route == nil { - log.Fatalln("Route not found:", name) + logger.Fatal("[Route] Route not found: %s", name) } var pairs []string @@ -31,7 +31,7 @@ func Path(router *mux.Router, name string, args ...interface{}) string { result, err := route.URLPath(pairs...) if err != nil { - log.Fatalln(err) + logger.Fatal("[Route] %v", err) } return result.String() diff --git a/server/server.go b/server/server.go index 7072fdc..8107614 100644 --- a/server/server.go +++ b/server/server.go @@ -6,11 +6,11 @@ package server import ( "crypto/tls" - "log" "net/http" "time" "github.com/gorilla/mux" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/scheduler" "golang.org/x/crypto/acme/autocert" @@ -46,20 +46,20 @@ func startServer(cfg *config.Config, handler *mux.Router) *http.Server { } go func() { - log.Printf(`Listening on "%s" by using auto-configured certificate for "%s"`, server.Addr, certDomain) - log.Fatalln(server.Serve(certManager.Listener())) + logger.Info(`Listening on "%s" by using auto-configured certificate for "%s"`, server.Addr, certDomain) + logger.Fatal(server.Serve(certManager.Listener()).Error()) }() } else if certFile != "" && keyFile != "" { server.TLSConfig = &tls.Config{MinVersion: tls.VersionTLS12} go func() { - log.Printf(`Listening on "%s" by using certificate "%s" and key "%s"`, server.Addr, certFile, keyFile) - log.Fatalln(server.ListenAndServeTLS(certFile, keyFile)) + logger.Info(`Listening on "%s" by using certificate "%s" and key "%s"`, server.Addr, certFile, keyFile) + logger.Fatal(server.ListenAndServeTLS(certFile, keyFile).Error()) }() } else { go func() { - log.Printf(`Listening on "%s" without TLS`, server.Addr) - log.Fatalln(server.ListenAndServe()) + logger.Info(`Listening on "%s" without TLS`, server.Addr) + logger.Fatal(server.ListenAndServe().Error()) }() } diff --git a/server/static/bin.go b/server/static/bin.go index fa5dd4e..8b0c78e 100644 --- a/server/static/bin.go +++ b/server/static/bin.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 21:44:02.652999925 -0800 PST m=+0.007410628 +// 2017-12-15 18:49:24.03816003 -0800 PST m=+0.010755902 package static diff --git a/server/static/css.go b/server/static/css.go index 26e4aab..70a9d8f 100644 --- a/server/static/css.go +++ b/server/static/css.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-13 20:40:03.300001544 -0800 PST m=+0.017854402 +// 2017-12-15 18:49:24.040014054 -0800 PST m=+0.012609926 package static diff --git a/server/static/js.go b/server/static/js.go index 4f21d2f..07d63fe 100644 --- a/server/static/js.go +++ b/server/static/js.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 21:44:02.656535482 -0800 PST m=+0.010946185 +// 2017-12-15 18:49:24.041876548 -0800 PST m=+0.014472420 package static diff --git a/server/template/common.go b/server/template/common.go index 8380d82..1c094bc 100644 --- a/server/template/common.go +++ b/server/template/common.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 21:44:02.670455816 -0800 PST m=+0.024866519 +// 2017-12-15 18:49:24.05332735 -0800 PST m=+0.025923222 package template diff --git a/server/template/template.go b/server/template/template.go index aa40aad..59dd0fb 100644 --- a/server/template/template.go +++ b/server/template/template.go @@ -8,7 +8,6 @@ import ( "bytes" "html/template" "io" - "log" "net/mail" "strings" "time" @@ -16,6 +15,7 @@ import ( "github.com/miniflux/miniflux/config" "github.com/miniflux/miniflux/errors" "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/server/route" "github.com/miniflux/miniflux/server/template/helper" "github.com/miniflux/miniflux/server/ui/filter" @@ -42,7 +42,6 @@ func (e *Engine) parseAll() { return e.cfg.Get("OAUTH2_PROVIDER", "") == provider }, "hasKey": func(dict map[string]string, key string) bool { - log.Println(dict) if value, found := dict[key]; found { return value != "" } @@ -110,7 +109,7 @@ func (e *Engine) parseAll() { } for name, content := range templateViewsMap { - log.Println("Parsing template:", name) + logger.Debug("[Template] Parsing: %s", name) e.templates[name] = template.Must(template.New("main").Funcs(funcMap).Parse(commonTemplates + content)) } } @@ -124,13 +123,13 @@ func (e *Engine) SetLanguage(language string) { func (e *Engine) Execute(w io.Writer, name string, data interface{}) { tpl, ok := e.templates[name] if !ok { - log.Fatalf("The template %s does not exists.\n", name) + logger.Fatal("[Template] The template %s does not exists", name) } var b bytes.Buffer err := tpl.ExecuteTemplate(&b, "base", data) if err != nil { - log.Fatalf("Unable to render template: %v\n", err) + logger.Fatal("[Template] Unable to render template: %v", err) } b.WriteTo(w) diff --git a/server/template/views.go b/server/template/views.go index cb85c83..f455c2f 100644 --- a/server/template/views.go +++ b/server/template/views.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 21:44:02.658745181 -0800 PST m=+0.013155884 +// 2017-12-15 18:49:24.044316922 -0800 PST m=+0.016912794 package template 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, |