rename insID

apache · Feb 12, 2020 · 7eeeede · 7eeeede
1 parent 205d991
commit 7eeeede
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/deployments/db.js b/deployments/db.js
@@ -108,6 +108,9 @@ db.createCollection( "polling_detail", {
                 session_id: {
                     bsonType: "string",
                 },
+                domain: {
+                    bsonType: "string",
+                },
                 polling_date: {
                     bsonType: "string"
                 },
@@ -139,6 +142,7 @@ db.kv.createIndex({key: 1, label_id: 1,domain:1,project:1},{ unique: true });
 db.label.createIndex({"id": 1}, { unique: true } );
 db.label.createIndex({format: 1,domain:1,project:1},{ unique: true });
 db.polling_detail.createIndex({"id": 1}, { unique: true } );
+db.polling_detail.createIndex({session:1,domain:1}, { unique: true } );
 db.view.createIndex({"id": 1}, { unique: true } );
 db.view.createIndex({display:1,domain:1,project:1},{ unique: true });
 //db config

diff --git a/pkg/model/kv.go b/pkg/model/kv.go
@@ -59,6 +59,7 @@ type ViewResponse struct {
 type PollingDetail struct {
 	ID             string                 `json:"id,omitempty" yaml:"id,omitempty"`
 	SessionID      string                 `json:"session_id,omitempty" yaml:"session_id,omitempty"`
+	Domain         string                 `json:"domain,omitempty" yaml:"domain,omitempty"`
 	PollingData    map[string]interface{} `json:"polling_data,omitempty" yaml:"polling_data,omitempty"`
 	IP             string                 `json:"ip,omitempty" yaml:"ip,omitempty"`
 	UserAgent      string                 `json:"user_agent,omitempty" yaml:"user_agent,omitempty"`

diff --git a/server/resource/v1/kv_resource.go b/server/resource/v1/kv_resource.go
@@ -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
@@ -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)
@@ -218,11 +218,12 @@ 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
+	data.Domain = domain
 	data.IP = iputil.ClientIP(context.Req.Request)
 	dataMap := map[string]interface{}{
 		"revStr":  revStr,