From f263b0466103785711e8a64f16a7f83d8de091a1 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 5 Aug 2018 17:47:15 +0200 Subject: [PATCH 1/5] Fix loading of stats.json and subscriptions.json --- cmd/hubserver/main.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/hubserver/main.go b/cmd/hubserver/main.go index ca14a29..39cf262 100644 --- a/cmd/hubserver/main.go +++ b/cmd/hubserver/main.go @@ -305,9 +305,7 @@ func (handler *subscriptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Req func (handler *subscriptionHandler) loadStats() error { file, err := os.Open("./stats.json") if err != nil { - if os.IsExist(err) { - return err - } else { + if os.IsNotExist(err) { handler.Stats = make(map[string]Stat) return nil } @@ -321,9 +319,7 @@ func (handler *subscriptionHandler) loadStats() error { func (handler *subscriptionHandler) loadSubscriptions() error { file, err := os.Open("./subscription.json") if err != nil { - if os.IsExist(err) { - return err - } else { + if os.IsNotExist(err) { handler.Subscribers = make(map[string][]Subscriber) return nil } From aa257744f02d78580875de0fd99af4dc98995dfb Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 5 Aug 2018 17:53:13 +0200 Subject: [PATCH 2/5] Disable stats --- cmd/hubserver/main.go | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/cmd/hubserver/main.go b/cmd/hubserver/main.go index 39cf262..434b03a 100644 --- a/cmd/hubserver/main.go +++ b/cmd/hubserver/main.go @@ -252,12 +252,12 @@ func (handler *subscriptionHandler) addSubscriberCallback(topic string, subscrib } func (handler *subscriptionHandler) incStat(name string) { - if v, e := handler.Stats[name]; e { - handler.Stats[name] = Stat{LastUpdate: time.Now(), Updates: v.Updates + 1} - } else { - handler.Stats[name] = Stat{LastUpdate: time.Now(), Updates: 1} - } - handler.saveStats() + // if v, e := handler.Stats[name]; e { + // handler.Stats[name] = Stat{LastUpdate: time.Now(), Updates: v.Updates + 1} + // } else { + // handler.Stats[name] = Stat{LastUpdate: time.Now(), Updates: 1} + // } + // handler.saveStats() } func (handler *subscriptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { @@ -268,7 +268,7 @@ func (handler *subscriptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Req enc := json.NewEncoder(w) enc.SetIndent("", " ") enc.Encode(handler.Subscribers) - enc.Encode(handler.Stats) + //enc.Encode(handler.Stats) } return } @@ -335,19 +335,20 @@ func (handler *subscriptionHandler) load() error { if err != nil { return err } - return handler.loadStats() + return nil //handler.loadStats() } func (handler *subscriptionHandler) saveStats() error { - file, err := os.Create("./stats.json") - if err != nil { - return err - } - defer file.Close() - dec := json.NewEncoder(file) - dec.SetIndent("", " ") - err = dec.Encode(&handler.Stats) - return err + // file, err := os.Create("./stats.json") + // if err != nil { + // return err + // } + // defer file.Close() + // dec := json.NewEncoder(file) + // dec.SetIndent("", " ") + // err = dec.Encode(&handler.Stats) + // return err + return nil } func (handler *subscriptionHandler) saveSubscriptions() error { From 68d84bdaa378bd4748b6392fad31039ffb353ed8 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 5 Aug 2018 18:00:15 +0200 Subject: [PATCH 3/5] Disable incStat --- cmd/hubserver/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/hubserver/main.go b/cmd/hubserver/main.go index 434b03a..44c94df 100644 --- a/cmd/hubserver/main.go +++ b/cmd/hubserver/main.go @@ -66,12 +66,12 @@ func (handler *subscriptionHandler) handlePublish(w http.ResponseWriter, r *http return err } - handler.incStat(fmt.Sprintf("publish.%s", topic)) + // handler.incStat(fmt.Sprintf("publish.%s", topic)) if subs, e := handler.Subscribers[topic]; e { for _, sub := range subs { - handler.incStat(fmt.Sprintf("publish.post.%s.%s", topic, sub.Callback)) + // handler.incStat(fmt.Sprintf("publish.post.%s.%s", topic, sub.Callback)) log.Printf("publish: creating post to %s\n", sub.Callback) postReq, err := http.NewRequest("POST", sub.Callback, strings.NewReader(string(feedContent))) if err != nil { @@ -264,7 +264,7 @@ func (handler *subscriptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Req if r.Method == http.MethodGet { fmt.Fprintln(w, "WebSub hub") if r.URL.Query().Get("debug") == "1" { - handler.incStat("http.index.debug") + // handler.incStat("http.index.debug") enc := json.NewEncoder(w) enc.SetIndent("", " ") enc.Encode(handler.Subscribers) From b8dc97ff86e5d8d305876c84e4e8010728dbae7f Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 5 Aug 2018 18:03:06 +0200 Subject: [PATCH 4/5] Build from git.p83.nl --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2aaa147..c0a4a9b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,8 +2,8 @@ pipeline: build: image: golang commands: - - go get github.com/pstuifzand/websub-hub/cmd/hubserver - - go build github.com/pstuifzand/websub-hub/cmd/hubserver + - go get p83.nl/go/websub-hub/cmd/hubserver + - go build p83.n/go/websub-hub/cmd/hubserver publish: image: plugins/docker From 280853054060f611f0bcf30abef5b7340c261f3f Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 5 Aug 2018 18:03:55 +0200 Subject: [PATCH 5/5] Fix typo in .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c0a4a9b..37b55a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ pipeline: image: golang commands: - go get p83.nl/go/websub-hub/cmd/hubserver - - go build p83.n/go/websub-hub/cmd/hubserver + - go build p83.nl/go/websub-hub/cmd/hubserver publish: image: plugins/docker