From d93530a237a1b53be33a015a74596d7b9b32254d Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sun, 9 Dec 2018 17:57:16 +0100 Subject: [PATCH] Remove os.GetEnv call --- cmd/eksterd/hubbackend.go | 3 ++- cmd/eksterd/main.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/eksterd/hubbackend.go b/cmd/eksterd/hubbackend.go index d9b3a3b..694586f 100644 --- a/cmd/eksterd/hubbackend.go +++ b/cmd/eksterd/hubbackend.go @@ -48,6 +48,7 @@ type HubBackend interface { type hubIncomingBackend struct { backend *memoryBackend + baseURL string } func (h *hubIncomingBackend) GetSecret(id int64) string { @@ -85,7 +86,7 @@ func (h *hubIncomingBackend) CreateFeed(topic string, channel string) (int64, er log.Printf("WebSub Hub URL found for topic=%s hub=%s\n", topic, hubURL) } - callbackURL := fmt.Sprintf("%s/incoming/%d", os.Getenv("EKSTER_BASEURL"), id) + callbackURL := fmt.Sprintf("%s/incoming/%d", h.baseURL, id) if err == nil && hubURL != "" { args := redis.Args{}.Add(fmt.Sprintf("feed:%d", id), "hub", hubURL, "callback", callbackURL) diff --git a/cmd/eksterd/main.go b/cmd/eksterd/main.go index a78eb73..af9cfed 100644 --- a/cmd/eksterd/main.go +++ b/cmd/eksterd/main.go @@ -112,7 +112,7 @@ func NewApp(options AppOptions) *App { app.backend = loadMemoryBackend() app.backend.AuthEnabled = options.AuthEnabled - app.hubBackend = &hubIncomingBackend{app.backend} + app.hubBackend = &hubIncomingBackend{app.backend, options.BaseURL} http.Handle("/micropub", µpubHandler{ Backend: app.backend,