From 1d8193b892bf63db6b91c66b9d048873bf1bc4cf Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Fri, 15 Dec 2017 18:55:57 -0800
Subject: Add logger

---
 reader/opml/handler.go    | 10 +++++-----
 reader/opml/serializer.go |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'reader/opml')

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 ""
 	}
 
-- 
cgit v1.2.3