diff options
| -rw-r--r-- | handler.go | 8 | ||||
| -rw-r--r-- | instance.go | 14 |
2 files changed, 11 insertions, 11 deletions
@@ -11,16 +11,16 @@ import ( "github.com/google/trillian" ) -// appHandler implements the http.Handler interface, and contains a reference +// handler implements the http.Handler interface, and contains a reference // to an STFE server instance as well as a function that uses it. -type appHandler struct { +type handler struct { instance *Instance // STFE server instance endpoint string // e.g., add-entry method string // e.g., GET handler func(context.Context, *Instance, http.ResponseWriter, *http.Request) (int, error) } -func (a appHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { +func (a handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { // export prometheus metrics var now time.Time = time.Now() var statusCode int @@ -46,7 +46,7 @@ func (a appHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } -func (a appHandler) sendHTTPError(w http.ResponseWriter, statusCode int, err error) { +func (a handler) sendHTTPError(w http.ResponseWriter, statusCode int, err error) { http.Error(w, http.StatusText(statusCode), statusCode) } diff --git a/instance.go b/instance.go index 65ebcb3..8e66f8f 100644 --- a/instance.go +++ b/instance.go @@ -96,14 +96,14 @@ func NewLogParameters(treeId int64, prefix string, anchorPath, keyPath string, m func (i *Instance) registerHandlers(mux *http.ServeMux) { for _, endpoint := range []struct { path string - handler appHandler + handler handler }{ - {i.LogParameters.Prefix + "/add-entry", appHandler{instance: i, handler: addEntry, endpoint: "add-entry", method: http.MethodPost}}, - {i.LogParameters.Prefix + "/get-entries", appHandler{instance: i, handler: getEntries, endpoint: "get-entries", method: http.MethodGet}}, - {i.LogParameters.Prefix + "/get-anchors", appHandler{instance: i, handler: getAnchors, endpoint: "get-anchors", method: http.MethodGet}}, - {i.LogParameters.Prefix + "/get-proof-by-hash", appHandler{instance: i, handler: getProofByHash, endpoint: "get-proof-by-hash", method: http.MethodGet}}, - {i.LogParameters.Prefix + "/get-consistency-proof", appHandler{instance: i, handler: getConsistencyProof, endpoint: "get-consistency-proof", method: http.MethodGet}}, - {i.LogParameters.Prefix + "/get-sth", appHandler{instance: i, handler: getSth, endpoint: "get-sth", method: http.MethodGet}}, + {i.LogParameters.Prefix + "/add-entry", handler{instance: i, handler: addEntry, endpoint: "add-entry", method: http.MethodPost}}, + {i.LogParameters.Prefix + "/get-entries", handler{instance: i, handler: getEntries, endpoint: "get-entries", method: http.MethodGet}}, + {i.LogParameters.Prefix + "/get-anchors", handler{instance: i, handler: getAnchors, endpoint: "get-anchors", method: http.MethodGet}}, + {i.LogParameters.Prefix + "/get-proof-by-hash", handler{instance: i, handler: getProofByHash, endpoint: "get-proof-by-hash", method: http.MethodGet}}, + {i.LogParameters.Prefix + "/get-consistency-proof", handler{instance: i, handler: getConsistencyProof, endpoint: "get-consistency-proof", method: http.MethodGet}}, + {i.LogParameters.Prefix + "/get-sth", handler{instance: i, handler: getSth, endpoint: "get-sth", method: http.MethodGet}}, } { glog.Infof("adding handler for %v", endpoint.path) mux.Handle(endpoint.path, endpoint.handler) |