From 7ed1d17373a83bc7862782a88ce5c2dc99dc15f1 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Thu, 5 Jul 2018 22:52:19 +0200 Subject: [PATCH] Improve logging and handling of items --- cmd/eksterd/fetch.go | 18 ++++++++++++++---- cmd/eksterd/memory.go | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cmd/eksterd/fetch.go b/cmd/eksterd/fetch.go index 10a15d1..8b46105 100644 --- a/cmd/eksterd/fetch.go +++ b/cmd/eksterd/fetch.go @@ -228,10 +228,9 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader) //r["_id"] = "" // generate random value } - if _, e := r["published"]; e { - item := mapToItem(r) - items = append(items, item) - } + // mapToItem adds published + item := mapToItem(r) + items = append(items, item) } } else if strings.HasPrefix(contentType, "application/json") { // json feed? var feed JSONFeed @@ -329,6 +328,14 @@ func (b *memoryBackend) feedItems(fetchURL, contentType string, body io.Reader) items[i] = v } } + + for _, v := range items { + log.Printf("Id=%s Name=%s\n", item.Id, item.Name) + log.Printf("Author=%#v\n", item.Author) + log.Printf("Text=%s\n", item.Content.Text) + log.Printf("HTML=%s\n", item.Content.HTML) + } + return items, nil } @@ -382,6 +389,9 @@ func (b *memoryBackend) channelAddItem(channel string, item microsub.Item) { Data: data, } + log.Printf("Adding item to channel %s\n", channel) + log.Printf("%#v\n", forRedis) + itemKey := fmt.Sprintf("item:%s", item.ID) _, err = redis.String(conn.Do("HMSET", redis.Args{}.Add(itemKey).AddFlat(&forRedis)...)) if err != nil { diff --git a/cmd/eksterd/memory.go b/cmd/eksterd/memory.go index 599d868..bea4776 100644 --- a/cmd/eksterd/memory.go +++ b/cmd/eksterd/memory.go @@ -346,6 +346,8 @@ func mapToItem(result map[string]interface{}) microsub.Item { if published, e := result["published"]; e { item.Published = published.(string) + } else { + item.Published = time.Now().Format(time.RFC3339) } if updated, e := result["updated"]; e {