github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move prefix methods

pull/6/head
Clayton Coleman 2014-07-29 18:11:22 -04:00
parent a2c86e4c97
commit 82b78912fc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/apiserver/apiserver.go
View File

@ -97,14 +97,6 @@ func New(storage map[string]RESTStorage, prefix string) *APIServer {
return s
}
func (server *APIServer) operationPrefix() string {
return path.Join(server.prefix, "operations")
}
func (server *APIServer) watchPrefix() string {
return path.Join(server.prefix, "watch")
}
// handleVersionReq writes the server's version information.
func (server *APIServer) handleVersionReq(w http.ResponseWriter, req *http.Request) {
server.writeRawJSON(http.StatusOK, version.Get(), w)
@ -157,7 +149,7 @@ func (s *APIServer) ServeREST(w http.ResponseWriter, req *http.Request) {
func (s *APIServer) write(statusCode int, object interface{}, w http.ResponseWriter) {
output, err := api.Encode(object)
if err != nil {
s.error(err, w)
internalError(err, w)
return
}
w.Header().Set("Content-Type", "application/json")
@ -338,6 +330,10 @@ func (s *APIServer) handleREST(parts []string, req *http.Request, w http.Respons
}
}
func (s *APIServer) operationPrefix() string {
return path.Join(s.prefix, "operations")
}
func (s *APIServer) handleOperationRequest(w http.ResponseWriter, req *http.Request) {
opPrefix := s.operationPrefix()
if !strings.HasPrefix(req.URL.Path, opPrefix) {
@ -375,6 +371,10 @@ func (s *APIServer) handleOperationRequest(w http.ResponseWriter, req *http.Requ
}
}
func (s *APIServer) watchPrefix() string {
return path.Join(s.prefix, "watch")
}
func (s *APIServer) handleWatch(w http.ResponseWriter, req *http.Request) {
prefix := s.watchPrefix()
if !strings.HasPrefix(req.URL.Path, prefix) {