clarify logs and gitignore and skipping vendor from now on

Former-commit-id: c8b61b58379d768f04e1593c2a77cf429407cf62
master
bel 2019-06-22 16:34:34 -06:00
parent 35b3ff2c2d
commit 71778e30c1
10 changed files with 19 additions and 17 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
rssmon3
exec-rssmon3
**.sw*

View File

@ -26,7 +26,7 @@ func (h *Handler) Run() error {
case j := <-h.Jobs: case j := <-h.Jobs:
go func(key string) { go func(key string) {
if err := h.Job(key); err != nil { if err := h.Job(key); err != nil {
log.Println(err) log.Println("[h.Run]", err)
} }
}(j.Key) }(j.Key)
} }

View File

@ -20,7 +20,7 @@ func main() {
if err := config.New(); err != nil { if err := config.New(); err != nil {
panic(err) panic(err)
} }
log.Println(config.Values()) log.Println("[main]", config.Values())
m, err := monitor.New() m, err := monitor.New()
if err != nil { if err != nil {
@ -50,7 +50,7 @@ func main() {
func InterruptAfter(foo func() error, c chan os.Signal) { func InterruptAfter(foo func() error, c chan os.Signal) {
if err := foo(); err != nil { if err := foo(); err != nil {
log.Println(err) log.Println("[InterruptAfter]", err)
} }
c <- syscall.SIGINT c <- syscall.SIGINT
} }

View File

@ -51,7 +51,7 @@ func (i *Item) Compare(other queue.Item) int {
func (i *Item) Interval() time.Duration { func (i *Item) Interval() time.Duration {
t, err := i.getInterval() t, err := i.getInterval()
if err != nil { if err != nil {
log.Println(err) log.Println("[Interval]", err)
return forever return forever
} }
return t return t
@ -81,14 +81,14 @@ func (i *Item) setInterval(t time.Duration) error {
func (i *Item) Last() time.Time { func (i *Item) Last() time.Time {
t, err := i.getLast() t, err := i.getLast()
if err != nil { if err != nil {
log.Println(err) log.Println("[Last]", err)
} }
return t return t
} }
func (i *Item) Mark() { func (i *Item) Mark() {
if err := i.setLast(time.Now()); err != nil { if err := i.setLast(time.Now()); err != nil {
log.Println(err) log.Println("[Mark]", err)
} }
} }

View File

@ -53,7 +53,7 @@ func (m *Monitor) triggered() <-chan time.Time {
return nil return nil
} }
block := time.Until(top.Last().Add(top.Interval())) block := time.Until(top.Last().Add(top.Interval()))
log.Printf("blocking %v until next task", block) log.Printf("[triggered] blocking %v until next task", block)
return time.After(time.Until(top.Last().Add(top.Interval()))) return time.After(time.Until(top.Last().Add(top.Interval())))
} }

View File

@ -43,11 +43,11 @@ func (q *Queue) Push(i *Item) {
q.queue.Put(i) q.queue.Put(i)
b, err := i.Encode() b, err := i.Encode()
if err != nil { if err != nil {
log.Println(err) log.Println("[Push]", err)
return return
} }
if err := config.Values().DB.Set(i.Key, b, nsQueued); err != nil { if err := config.Values().DB.Set(i.Key, b, nsQueued); err != nil {
log.Println(err) log.Println("[Push]", err)
return return
} }
} }

View File

@ -74,20 +74,20 @@ func (f *Feed) Pull() error {
for _, i := range gofeed.Items { for _, i := range gofeed.Items {
item, err := newItem(i, f.ContentFilter) item, err := newItem(i, f.ContentFilter)
if err != nil { if err != nil {
log.Println(err) log.Println("[Pull]", err)
continue continue
} }
itemTSs = append(itemTSs, &item.TS) itemTSs = append(itemTSs, &item.TS)
if item.TS.Before(f.Updated) { if item.TS.Before(f.Updated) {
log.Println("Skipping old item") log.Println("[Pull]", "Skipping old item")
continue continue
} }
if ok := regexp.MustCompile(f.TitleFilter).MatchString(item.Title); !ok { if ok := regexp.MustCompile(f.TitleFilter).MatchString(item.Title); !ok {
log.Println("Skipping bad titled item") log.Println("[Pull]", "Skipping bad titled item")
continue continue
} }
if err := item.save(f.Key); err != nil { if err := item.save(f.Key); err != nil {
log.Println(err) log.Println("[Pull]", err)
continue continue
} }
} }

View File

@ -24,7 +24,7 @@ func (rss *RSS) Run() error {
return nil return nil
case i := <-rss.items: case i := <-rss.items:
if err := rss.update(i); err != nil { if err := rss.update(i); err != nil {
log.Println(err) log.Println("[rss.Run]", err)
} }
} }
} }

View File

@ -1 +0,0 @@
49c1645f536cea7463202894e751295a3ec589f1

View File

@ -35,13 +35,13 @@ func (s *Server) notFound(w http.ResponseWriter, r *http.Request) {
func (s *Server) userError(w http.ResponseWriter, r *http.Request, err error) { func (s *Server) userError(w http.ResponseWriter, r *http.Request, err error) {
status := http.StatusBadRequest status := http.StatusBadRequest
log.Printf("%d: %v", status, err) log.Printf("[userError] %d: %v", status, err)
w.WriteHeader(status) w.WriteHeader(status)
} }
func (s *Server) error(w http.ResponseWriter, r *http.Request, err error) { func (s *Server) error(w http.ResponseWriter, r *http.Request, err error) {
status := http.StatusInternalServerError status := http.StatusInternalServerError
log.Printf("%d: %v", status, err) log.Printf("[error] %d: %v", status, err)
w.WriteHeader(status) w.WriteHeader(status)
} }