Repository: incubator-htrace Updated Branches: refs/heads/master e1aa7a929 -> e011fd01e
HTRACE-98. Web Server should use PrefixHandler (Abraham Elmahrek via Colin P. McCabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/e011fd01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/e011fd01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/e011fd01 Branch: refs/heads/master Commit: e011fd01ea161c9e3185886bb14d8c3abd7646a6 Parents: e1aa7a9 Author: Colin P. Mccabe <[email protected]> Authored: Thu Jan 29 15:31:44 2015 -0800 Committer: Colin P. Mccabe <[email protected]> Committed: Thu Jan 29 15:31:44 2015 -0800 ---------------------------------------------------------------------- htrace-core/src/go/src/org/apache/htrace/htraced/rest.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/e011fd01/htrace-core/src/go/src/org/apache/htrace/htraced/rest.go ---------------------------------------------------------------------- diff --git a/htrace-core/src/go/src/org/apache/htrace/htraced/rest.go b/htrace-core/src/go/src/org/apache/htrace/htraced/rest.go index 39e5744..3ecb14b 100644 --- a/htrace-core/src/go/src/org/apache/htrace/htraced/rest.go +++ b/htrace-core/src/go/src/org/apache/htrace/htraced/rest.go @@ -221,6 +221,7 @@ func (hand *defaultServeHandler) ServeHTTP(w http.ResponseWriter, req *http.Requ ident = "index.html" // default to index.html } ident = strings.Replace(ident, "/", "__", -1) + hand.lg.Debugf("defaultServeHandler(path=%s, ident=%s)\n", req.URL.Path, ident) rsc := resource.Catalog[ident] if rsc == "" { hand.lg.Warnf("failed to find entry for %s\n", ident) @@ -254,8 +255,6 @@ func CreateRestServer(cnf *conf.Config, store *dataStore) (*RestServer, error) { rsv.lg = common.NewLogger("rest", cnf) r := mux.NewRouter().StrictSlash(false) - // Default Handler. This will serve requests for static requests. - r.Handle("/", &defaultServeHandler{lg: rsv.lg}) r.Handle("/server/info", &serverInfoHandler{lg: rsv.lg}).Methods("GET") @@ -274,6 +273,9 @@ func CreateRestServer(cnf *conf.Config, store *dataStore) (*RestServer, error) { lg: rsv.lg}} span.Handle("/{id}/children", findChildrenH).Methods("GET") + // Default Handler. This will serve requests for static requests. + r.PathPrefix("/").Handler(&defaultServeHandler{lg: rsv.lg}).Methods("GET") + go http.Serve(rsv.listener, r) rsv.lg.Infof("Started REST server on %s...\n", rsv.listener.Addr().String())
