aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader/opml
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2017-12-15 18:55:57 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net>2017-12-15 18:55:57 -0800
commit1d8193b892bf63db6b91c66b9d048873bf1bc4cf (patch)
tree4ca54691f7fab88f73f657f005e26d75ae5f0058 /reader/opml
parentc6d9eb361454b70406cf6573b284d5e99ba3a2d2 (diff)
Add logger
Diffstat (limited to 'reader/opml')
-rw-r--r--reader/opml/handler.go10
-rw-r--r--reader/opml/serializer.go5
2 files changed, 8 insertions, 7 deletions
diff --git a/reader/opml/handler.go b/reader/opml/handler.go
index 192e04a..ec05670 100644
--- a/reader/opml/handler.go
+++ b/reader/opml/handler.go
@@ -8,8 +8,8 @@ import (
"errors"
"fmt"
"io"
- "log"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/storage"
)
@@ -23,7 +23,7 @@ type Handler struct {
func (h *Handler) Export(userID int64) (string, error) {
feeds, err := h.store.Feeds(userID)
if err != nil {
- log.Println(err)
+ logger.Error("[OPML:Export] %v", err)
return "", errors.New("unable to fetch feeds")
}
@@ -54,13 +54,13 @@ func (h *Handler) Import(userID int64, data io.Reader) (err error) {
if subscription.CategoryName == "" {
category, err = h.store.FirstCategory(userID)
if err != nil {
- log.Println(err)
+ logger.Error("[OPML:Import] %v", err)
return errors.New("unable to find first category")
}
} else {
category, err = h.store.CategoryByTitle(userID, subscription.CategoryName)
if err != nil {
- log.Println(err)
+ logger.Error("[OPML:Import] %v", err)
return errors.New("unable to search category by title")
}
@@ -72,7 +72,7 @@ func (h *Handler) Import(userID int64, data io.Reader) (err error) {
err := h.store.CreateCategory(category)
if err != nil {
- log.Println(err)
+ logger.Error("[OPML:Import] %v", err)
return fmt.Errorf(`unable to create this category: "%s"`, subscription.CategoryName)
}
}
diff --git a/reader/opml/serializer.go b/reader/opml/serializer.go
index 5ba494e..68cafa9 100644
--- a/reader/opml/serializer.go
+++ b/reader/opml/serializer.go
@@ -8,7 +8,8 @@ import (
"bufio"
"bytes"
"encoding/xml"
- "log"
+
+ "github.com/miniflux/miniflux/logger"
)
// Serialize returns a SubcriptionList in OPML format.
@@ -37,7 +38,7 @@ func Serialize(subscriptions SubcriptionList) string {
encoder := xml.NewEncoder(writer)
encoder.Indent(" ", " ")
if err := encoder.Encode(feeds); err != nil {
- log.Println(err)
+ logger.Error("[OPML:Serialize] %v", err)
return ""
}