wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Make handlers public

This commit is contained in:
Martin Polden 2015-09-17 22:16:33 +02:00
parent 042f0d975f
commit 5d4f6b3d3d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/api.go
View File

@ -93,7 +93,7 @@ func headerKeyFromRequest(r *http.Request) string {
return key return key
} }
func (a *API) LookupCountry(ip net.IP) (string, error) { func (a *API) lookupCountry(ip net.IP) (string, error) {
if a.db == nil { if a.db == nil {
return "", nil return "", nil
} }
@ -116,7 +116,7 @@ func (a *API) handleError(w http.ResponseWriter, err error) {
io.WriteString(w, "Internal server error") io.WriteString(w, "Internal server error")
} }
func (a *API) defaultHandler(w http.ResponseWriter, r *http.Request) { func (a *API) DefaultHandler(w http.ResponseWriter, r *http.Request) {
cmd := cmdFromQueryParams(r.URL.Query()) cmd := cmdFromQueryParams(r.URL.Query())
funcMap := template.FuncMap{"ToLower": strings.ToLower} funcMap := template.FuncMap{"ToLower": strings.ToLower}
t, err := template.New(filepath.Base(a.Template)).Funcs(funcMap).ParseFiles(a.Template) t, err := template.New(filepath.Base(a.Template)).Funcs(funcMap).ParseFiles(a.Template)
@ -139,11 +139,10 @@ func (a *API) defaultHandler(w http.ResponseWriter, r *http.Request) {
if err := t.Execute(w, &data); err != nil { if err := t.Execute(w, &data); err != nil {
a.handleError(w, err) a.handleError(w, err)
return
} }
} }
func (a *API) jsonHandler(w http.ResponseWriter, r *http.Request) { func (a *API) JSONHandler(w http.ResponseWriter, r *http.Request) {
key := headerKeyFromRequest(r) key := headerKeyFromRequest(r)
if key == "" { if key == "" {
key = IP_HEADER key = IP_HEADER
@ -157,7 +156,7 @@ func (a *API) jsonHandler(w http.ResponseWriter, r *http.Request) {
w.Write(b) w.Write(b)
} }
func (a *API) cliHandler(w http.ResponseWriter, r *http.Request) { func (a *API) CLIHandler(w http.ResponseWriter, r *http.Request) {
key := headerKeyFromRequest(r) key := headerKeyFromRequest(r)
if key == "" { if key == "" {
key = IP_HEADER key = IP_HEADER
@ -180,7 +179,7 @@ func (a *API) requestFilter(next http.Handler) http.Handler {
r.Header.Set(IP_HEADER, err.Error()) r.Header.Set(IP_HEADER, err.Error())
} else { } else {
r.Header.Set(IP_HEADER, ip.String()) r.Header.Set(IP_HEADER, ip.String())
country, err := a.LookupCountry(ip) country, err := a.lookupCountry(ip)
if err != nil { if err != nil {
r.Header.Set(COUNTRY_HEADER, err.Error()) r.Header.Set(COUNTRY_HEADER, err.Error())
} else { } else {
@ -199,16 +198,16 @@ func (a *API) Handlers() http.Handler {
r := mux.NewRouter() r := mux.NewRouter()
// JSON // JSON
r.HandleFunc("/", a.jsonHandler).Methods("GET").Headers("Accept", "application/json") r.HandleFunc("/", a.JSONHandler).Methods("GET").Headers("Accept", "application/json")
r.HandleFunc("/{key}", a.jsonHandler).Methods("GET").Headers("Accept", "application/json") r.HandleFunc("/{key}", a.JSONHandler).Methods("GET").Headers("Accept", "application/json")
r.HandleFunc("/{key}.json", a.jsonHandler).Methods("GET") r.HandleFunc("/{key}.json", a.JSONHandler).Methods("GET")
// CLI // CLI
r.HandleFunc("/", a.cliHandler).Methods("GET").MatcherFunc(cliMatcher) r.HandleFunc("/", a.CLIHandler).Methods("GET").MatcherFunc(cliMatcher)
r.HandleFunc("/{key}", a.cliHandler).Methods("GET").MatcherFunc(cliMatcher) r.HandleFunc("/{key}", a.CLIHandler).Methods("GET").MatcherFunc(cliMatcher)
// Default // Default
r.HandleFunc("/", a.defaultHandler).Methods("GET") r.HandleFunc("/", a.DefaultHandler).Methods("GET")
// Pass all requests through the request filter // Pass all requests through the request filter
return a.requestFilter(r) return a.requestFilter(r)