Archive/Rssmon2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no more logger

Browse Source
This commit is contained in:
Bel LaPointe
2019-05-02 09:35:57 -06:00
parent 7bfae2f004
commit a57dff60d8
5 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
exchange/exchange.go
View File

@@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"local/logger"
"local/rssmon2/monitor"
"local/rssmon2/rss"
"local/rssmon2/server"
@@ -68,12 +67,12 @@ func (ex *Exchange) LoadDB() error {
func (ex *Exchange) NewFeed(url, itemFilter, contentFilter string, tags []string, interval time.Duration) {
feed, err := rss.New(url, itemFilter, contentFilter, tags, interval)
if err != nil {
logger.Logf("can't create new RSS %q: %v", url, err)
log.Printf("can't create new RSS %q: %v", url, err)
return
}
ex.allFeeds[url] = feed
if err := ex.Mon.Submit(url, feed.Interval); err != nil {
logger.Logf("Cannot accept new feed %q: %v", url, err)
log.Printf("Cannot accept new feed %q: %v", url, err)
}
}
@@ -191,48 +190,48 @@ func (ex *Exchange) UpdateFeed(url string) {
if !ok {
f, err := rss.New(url, "", "", nil, time.Minute)
if err != nil {
logger.Logf("cannot identify unknown feed triggered in monitor: %q: %v", url, err)
log.Printf("cannot identify unknown feed triggered in monitor: %q: %v", url, err)
return
}
b, err := ex.SClient.Get(nsForFeeds, f.ID())
if err != nil {
logger.Logf("cannot get unknown feed triggered in monitor: %q: %v", url, err)
log.Printf("cannot get unknown feed triggered in monitor: %q: %v", url, err)
return
}
feed, err = rss.Deserialize(b)
if err != nil {
logger.Logf("cannot deserialize feed triggered in monitor: %q: %v", url, err)
log.Printf("cannot deserialize feed triggered in monitor: %q: %v", url, err)
return
}
}
items, err := ex.allFeeds[url].Update()
if err != nil {
logger.Logf("can't update old RSS %q: %v", url, err)
log.Printf("can't update old RSS %q: %v", url, err)
return
}
b, err := feed.Serialize()
if err != nil {
logger.Logf("can't serialize to save RSS %q: %v", url, err)
log.Printf("can't serialize to save RSS %q: %v", url, err)
return
}
if err := ex.SClient.Set(nsForFeeds, feed.ID(), b); err != nil {
logger.Logf("can't save RSS %q.%q: %v", nsForFeeds, feed.ID(), err)
log.Printf("can't save RSS %q.%q: %v", nsForFeeds, feed.ID(), err)
return
}
logger.Log("Saved feed", feed)
log.Print("Saved feed", feed)
for i := range items {
b, err := items[i].Serialize()
if err != nil {
logger.Logf("can't save rss item %q.%q: %v", url, items[i].Link, err)
log.Printf("can't save rss item %q.%q: %v", url, items[i].Link, err)
return
}
if err := ex.SClient.Set(feed.ID(), items[i].ID(), b); err != nil {
logger.Logf("can't save rss item %q.%q: %v", feed.ID(), items[i].ID(), err)
log.Printf("can't save rss item %q.%q: %v", feed.ID(), items[i].ID(), err)
return
}
//logger.Log("Saved feed item", feed.ID(), items[i].ID(), items[i])
//log.Print("Saved feed item", feed.ID(), items[i].ID(), items[i])
}
logger.Logf("Saved %d feed items for %s", len(items), feed.Title)
log.Printf("Saved %d feed items for %s", len(items), feed.Title)
go ex.handlerByTag(feed.Tags, items)
}
@@ -289,13 +288,13 @@ func (ex *Exchange) handlerPodcast(item *rss.Item) {
func (ex *Exchange) handlerTorrent(item *rss.Item) {
magnet := regexp.MustCompile("magnet:.xt[^ $]*")
if !magnet.MatchString(item.Content) {
logger.Log("no magnet link: ", item.Content)
log.Print("no magnet link: ", item.Content)
}
match := magnet.FindString(item.Content)
resp, err := http.Get(ex.toraddr)
if err != nil {
logger.Logf("cannot get session id at %v: %v", ex.toraddr, err)
log.Printf("cannot get session id at %v: %v", ex.toraddr, err)
return
}
sessionID := resp.Header.Get("X-Transmission-Session-Id")
@@ -307,28 +306,28 @@ func (ex *Exchange) handlerTorrent(item *rss.Item) {
},
})
if err != nil {
logger.Log("cannot build request body: %v", err)
log.Print("cannot build request body: %v", err)
return
}
req, err := http.NewRequest("POST", ex.toraddr, bytes.NewBuffer(requestBody))
if err != nil {
logger.Log("cannot POST request: %v", err)
log.Print("cannot POST request: %v", err)
return
}
req.Header.Add("X-Transmission-Session-Id", sessionID)
resp, err = (&http.Client{}).Do(req)
if err != nil {
logger.Log("failed POST: %v", err)
log.Print("failed POST: %v", err)
return
}
var out map[string]interface{}
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
logger.Log("cannot decode response: %v", err)
log.Print("cannot decode response: %v", err)
return
}
if v, ok := out["result"]; !ok || v != "success" {
logger.Logf("failed magnet submission for feed item %v: %v", item.Name, v)
log.Printf("failed magnet submission for feed item %v: %v", item.Name, v)
}
}