peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Remove os.GetEnv call

Browse Source
This commit is contained in:
Peter Stuifzand 2018-12-09 17:57:16 +01:00
parent 47661b73f1
commit d93530a237
Signed by: peter
GPG Key ID: 374322D56E5209E8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/eksterd/hubbackend.go
View File

@ -48,6 +48,7 @@ type HubBackend interface {
type hubIncomingBackend struct { type hubIncomingBackend struct {
backend *memoryBackend backend *memoryBackend
baseURL string
} }
func (h *hubIncomingBackend) GetSecret(id int64) 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) 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 != "" { if err == nil && hubURL != "" {
args := redis.Args{}.Add(fmt.Sprintf("feed:%d", id), "hub", hubURL, "callback", callbackURL) args := redis.Args{}.Add(fmt.Sprintf("feed:%d", id), "hub", hubURL, "callback", callbackURL)

2
cmd/eksterd/main.go
View File

@ -112,7 +112,7 @@ func NewApp(options AppOptions) *App {
app.backend = loadMemoryBackend() app.backend = loadMemoryBackend()
app.backend.AuthEnabled = options.AuthEnabled app.backend.AuthEnabled = options.AuthEnabled
app.hubBackend = &hubIncomingBackend{app.backend} app.hubBackend = &hubIncomingBackend{app.backend, options.BaseURL}
http.Handle("/micropub", &micropubHandler{ http.Handle("/micropub", &micropubHandler{
Backend: app.backend, Backend: app.backend,