Beautify logs with xlog

This commit is contained in:
Andreas Neue
2016-03-12 13:09:25 +01:00
parent 13379b29ea
commit 1dea72f6c7
11 changed files with 60 additions and 48 deletions
+7 -6
View File
@@ -11,10 +11,11 @@ import (
"errors"
"fmt"
"io"
"log"
"os"
"time"
"code.dnix.de/an/xlog"
gorss "github.com/jteeuwen/go-pkg-rss"
"github.com/jteeuwen/go-pkg-xmlx"
"github.com/sorcix/irc"
@@ -24,8 +25,8 @@ var hideOutput = true
func init() {
MsgHandlers["rss"] = rssHandleMessage
log.Printf("Initializing rss module")
go rssRun()
xlog.Info("RSS module initialized")
}
func rssRun() {
@@ -33,7 +34,7 @@ func rssRun() {
path := ModParams["rss-feeds"]
file, err := os.Open(path)
if err != nil {
log.Fatal(err)
xlog.Fatal(err.Error())
}
defer file.Close()
scanner := bufio.NewScanner(file)
@@ -41,7 +42,7 @@ func rssRun() {
go rssPollFeed(scanner.Text(), 5, rssCharsetReader)
}
if err := scanner.Err(); err != nil {
log.Fatal(err)
xlog.Fatal(err.Error())
}
go func() {
time.Sleep(60 * time.Second)
@@ -55,9 +56,9 @@ func rssHandleMessage(m *irc.Message) {
func rssPollFeed(uri string, timeout int, cr xmlx.CharsetFunc) {
feed := gorss.New(timeout, true, rssChanHandler, rssItemHandler)
for {
log.Printf("Polling feed: %s", uri)
xlog.Info("Polling feed: %s", uri)
if err := feed.Fetch(uri, cr); err != nil {
log.Printf("[e] %s: %s", "*", uri, err)
xlog.Info("[e] %s: %s", "*", uri, err)
SayCh <- fmt.Sprintf("%s\n[RSS] Error %s: %s", "*", uri, err)
return
}