From da53190a976ced9a8f12cbe2de863805237d3366 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 13 May 2018 19:38:46 +0200 Subject: [PATCH] Improve logging on client calls --- cmd/server/memory.go | 5 +++++ pkg/client/requests.go | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/cmd/server/memory.go b/cmd/server/memory.go index a1971f1..cfeddb1 100644 --- a/cmd/server/memory.go +++ b/cmd/server/memory.go @@ -180,9 +180,14 @@ func (b *memoryBackend) ChannelsUpdate(uid, name string) microsub.Channel { // ChannelsDelete deletes a channel func (b *memoryBackend) ChannelsDelete(uid string) { defer b.save() + if _, e := b.Channels[uid]; e { delete(b.Channels, uid) } + + if _, e := b.Feeds[uid]; e { + delete(b.Feeds, uid) + } } func mapToAuthor(result map[string]string) *microsub.Card { diff --git a/pkg/client/requests.go b/pkg/client/requests.go index 0069b50..ff36a59 100644 --- a/pkg/client/requests.go +++ b/pkg/client/requests.go @@ -62,6 +62,7 @@ func (c *Client) ChannelsGetList() []microsub.Channel { args := make(map[string]string) res, err := c.microsubGetRequest("channels", args) if err != nil { + log.Println(err) return []microsub.Channel{} } defer res.Body.Close() @@ -83,6 +84,7 @@ func (c *Client) TimelineGet(before, after, channel string) microsub.Timeline { args["channel"] = channel res, err := c.microsubGetRequest("timeline", args) if err != nil { + log.Println(err) return microsub.Timeline{} } defer res.Body.Close() @@ -100,6 +102,7 @@ func (c *Client) PreviewURL(url string) microsub.Timeline { args["url"] = url res, err := c.microsubGetRequest("preview", args) if err != nil { + log.Println(err) return microsub.Timeline{} } defer res.Body.Close() @@ -114,6 +117,7 @@ func (c *Client) FollowGetList(channel string) []microsub.Feed { args["channel"] = channel res, err := c.microsubGetRequest("follow", args) if err != nil { + log.Println(err) return []microsub.Feed{} } defer res.Body.Close() @@ -131,6 +135,7 @@ func (c *Client) ChannelsCreate(name string) microsub.Channel { args["name"] = name res, err := c.microsubPostRequest("channels", args) if err != nil { + log.Println(err) return microsub.Channel{} } defer res.Body.Close() @@ -146,6 +151,7 @@ func (c *Client) ChannelsUpdate(uid, name string) microsub.Channel { args["uid"] = uid res, err := c.microsubPostRequest("channels", args) if err != nil { + log.Println(err) return microsub.Channel{} } defer res.Body.Close() @@ -161,6 +167,7 @@ func (c *Client) ChannelsDelete(uid string) { args["method"] = "delete" res, err := c.microsubPostRequest("channels", args) if err != nil { + log.Println(err) return } res.Body.Close() @@ -172,6 +179,7 @@ func (c *Client) FollowURL(channel, url string) microsub.Feed { args["url"] = url res, err := c.microsubPostRequest("follow", args) if err != nil { + log.Println(err) return microsub.Feed{} } defer res.Body.Close() @@ -187,6 +195,7 @@ func (c *Client) UnfollowURL(channel, url string) { args["url"] = url res, err := c.microsubPostRequest("unfollow", args) if err != nil { + log.Println(err) return } res.Body.Close() @@ -197,6 +206,7 @@ func (c *Client) Search(query string) []microsub.Feed { args["query"] = query res, err := c.microsubPostRequest("search", args) if err != nil { + log.Println(err) return []microsub.Feed{} } type searchResponse struct {