Skip to content

Commit

Permalink
rename insID
Browse files Browse the repository at this point in the history
  • Loading branch information
GuoYL123 committed Feb 12, 2020
1 parent 205d991 commit 2bc5d81
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions server/resource/v1/kv_resource.go
Expand Up @@ -116,14 +116,14 @@ func (r *KVResource) GetByKey(rctx *restful.Context) {
WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText)
return
}
insId := rctx.ReadHeader("insId")
insID := rctx.ReadHeader("insId")
statusStr := rctx.ReadQueryParameter("status")
status, err := checkStatus(statusStr)
if err != nil {
WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText)
return
}
returnData(rctx, domain, project, labels, limit, offset, status, insId)
returnData(rctx, domain, project, labels, limit, offset, status, insID)
}

//List response kv list
Expand All @@ -147,20 +147,20 @@ func (r *KVResource) List(rctx *restful.Context) {
WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText)
return
}
insId := rctx.ReadHeader("insId")
insID := rctx.ReadHeader("insId")
statusStr := rctx.ReadQueryParameter("status")
status, err := checkStatus(statusStr)
if err != nil {
WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText)
return
}
returnData(rctx, domain, project, labels, limit, offset, status, insId)
returnData(rctx, domain, project, labels, limit, offset, status, insID)
}

func returnData(rctx *restful.Context, domain interface{}, project string, labels map[string]string, limit, offset int64, status, insId string) {
func returnData(rctx *restful.Context, domain interface{}, project string, labels map[string]string, limit, offset int64, status, insID string) {
revStr := rctx.ReadQueryParameter(common.QueryParamRev)
wait := rctx.ReadQueryParameter(common.QueryParamWait)
go RecordPollingDetail(rctx, revStr, wait, domain.(string), project, labels, limit, offset, insId)
go RecordPollingDetail(rctx, revStr, wait, domain.(string), project, labels, limit, offset, insID)
if revStr == "" {
if wait == "" {
queryAndResponse(rctx, domain, project, "", labels, limit, offset, status)
Expand Down Expand Up @@ -218,11 +218,11 @@ func returnData(rctx *restful.Context, domain interface{}, project string, label
}

//RecordPollingDetail to record data after get or list
func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insId string) {
func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insID string) {
Wg.Add(1)
data := &model.PollingDetail{}
data.ID = uuid.NewV4().String()
data.SessionID = insId + domain
data.SessionID = insID + domain
data.IP = iputil.ClientIP(context.Req.Request)
dataMap := map[string]interface{}{
"revStr": revStr,
Expand Down

0 comments on commit 2bc5d81

Please sign in to comment.