diff --git a/api_logs/api-logs.go b/api_logs/api-logs.go index b68c611a203845b2339cb19543ce63a18f01931f..0e853e9aba747697a91f34b5b6ac261c741260cd 100644 --- a/api_logs/api-logs.go +++ b/api_logs/api-logs.go @@ -113,11 +113,15 @@ func GenerateOutgoingAPILog(startTime time.Time, requestID *string, claim map[st providerID, _ := claim["ProviderID"].(int64) params := map[string]string{} + path := "" + address := "" parsedURL, err := url.Parse(urlString) if err == nil { for n, v := range parsedURL.Query() { params[n] = strings.Join(v, ",") } + path = parsedURL.Path + address = parsedURL.Host } typeString := "api-outgoing" @@ -131,8 +135,8 @@ func GenerateOutgoingAPILog(startTime time.Time, requestID *string, claim map[st DurMs: endTime.Sub(startTime).Milliseconds(), Type: typeString, Method: method, - Path: parsedURL.Path, - Address: parsedURL.Host, + Path: path, + Address: address, ResponseCode: responseCode, RequestID: currentRequestID, UserID: userID, diff --git a/search/document_store.go b/search/document_store.go index 76f34aa92916390abd0ce8ea738e9cfd3427c9cb..9a6fb1c3518e6be0c9e8a3c1b6e5eff47b831548 100644 --- a/search/document_store.go +++ b/search/document_store.go @@ -142,7 +142,7 @@ func (ds *DocumentStore) Write(id string, data interface{}) error { // Search // Return: // docs will be a slice of the DocumentStore data type -func (ds *DocumentStore) Search(query Query, sort []map[string]string, limit int64, offset int64) (res *SearchResponseHits, err error) { +func (ds *DocumentStore) Search(query Query, limit int64) (res *SearchResponseHits, err error) { if ds == nil { return nil, errors.Errorf("document store == nil") } @@ -162,9 +162,7 @@ func (ds *DocumentStore) Search(query Query, sort []map[string]string, limit int // } // } body := SearchRequestBody{ - Sort: sort, Size: limit, - From: offset, Query: query, Timeout: Timeout, }