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

Move Microsub handler to it's own package
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2018-09-15 10:23:11 +02:00
parent 7e15298175
commit 8a69473baf
Signed by: peter
GPG Key ID: 374322D56E5209E8
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/eksterd/main.go
View File

@ -120,7 +120,7 @@ func main() {
Backend: backend.(*memoryBackend), Backend: backend.(*memoryBackend),
}) })
handler := server.NewMicrosubHandler(backend, pool) handler := server.NewMicrosubHandler(backend)
if authEnabled { if authEnabled {
handler = WithAuth(handler, backend.(*memoryBackend)) handler = WithAuth(handler, backend.(*memoryBackend))
} }

12
pkg/server/microsub.go
View File

@ -22,12 +22,9 @@ import (
"fmt" "fmt"
"log" "log"
"net/http" "net/http"
"os"
"regexp" "regexp"
"p83.nl/go/ekster/pkg/microsub" "p83.nl/go/ekster/pkg/microsub"
"github.com/gomodule/redigo/redis"
) )
var ( var (
@ -36,18 +33,13 @@ var (
type microsubHandler struct { type microsubHandler struct {
backend microsub.Microsub backend microsub.Microsub
pool *redis.Pool
} }
func NewMicrosubHandler(backend microsub.Microsub, pool *redis.Pool) http.Handler { func NewMicrosubHandler(backend microsub.Microsub) http.Handler {
return &microsubHandler{backend, pool} return &microsubHandler{backend}
} }
func (h *microsubHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *microsubHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
var logger = log.New(os.Stdout, "logger: ", log.Lshortfile)
conn := redis.NewLoggingConn(h.pool.Get(), logger, "microsub")
defer conn.Close()
r.ParseForm() r.ParseForm()
log.Printf("%s %s\n", r.Method, r.URL) log.Printf("%s %s\n", r.Method, r.URL)
log.Println(r.URL.Query()) log.Println(r.URL.Query())