Skip to content

Commit

Permalink
Merge pull request #273 from linkernetworks/johnlin/volume-handler
Browse files Browse the repository at this point in the history
[Hot-fix] volume handler
  • Loading branch information
John-Lin authored Aug 23, 2018
2 parents f0d5f8f + 7b5d54f commit 0a7a32c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/server/handler_volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"gopkg.in/mgo.v2/bson"
)

func createVolume(ctx *web.Context) {
func createVolumeHandler(ctx *web.Context) {
sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
mgoID, ok := req.Attribute("UserID").(string)
if !ok {
Expand Down Expand Up @@ -72,7 +72,7 @@ func createVolume(ctx *web.Context) {
resp.WriteHeaderAndEntity(http.StatusCreated, v)
}

func deleteVolume(ctx *web.Context) {
func deleteVolumeHandler(ctx *web.Context) {
sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response

id := req.PathParameter("id")
Expand Down Expand Up @@ -112,7 +112,7 @@ func deleteVolume(ctx *web.Context) {
})
}

func listVolume(ctx *web.Context) {
func listVolumeHandler(ctx *web.Context) {
sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response

var pageSize = 10
Expand Down
6 changes: 3 additions & 3 deletions src/server/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ func newVolumeService(sp *serviceprovider.Container) *restful.WebService {
webService := new(restful.WebService)
webService.Path("/v1/volume").Consumes(restful.MIME_JSON, restful.MIME_JSON).Produces(restful.MIME_JSON, restful.MIME_JSON)
webService.Filter(validateTokenMiddleware)
webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, createVolume)))
webService.Route(webService.DELETE("/{id}").To(handler.RESTfulServiceHandler(sp, deleteVolume)))
webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, listVolume)))
webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, createVolumeHandler)))
webService.Route(webService.DELETE("/{id}").To(handler.RESTfulServiceHandler(sp, deleteVolumeHandler)))
webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, listVolumeHandler)))
return webService
}

Expand Down

0 comments on commit 0a7a32c

Please sign in to comment.