diff --git a/src/router/routes/route_search.go b/src/router/routes/route_search.go index 14f20e66..e916a5c7 100644 --- a/src/router/routes/route_search.go +++ b/src/router/routes/route_search.go @@ -5,6 +5,7 @@ import ( "net/http" "strconv" "strings" + "time" "github.com/hearchco/agent/src/cache" "github.com/hearchco/agent/src/cli" @@ -20,6 +21,9 @@ import ( ) func routeSearch(w http.ResponseWriter, r *http.Request, catsConf map[category.Name]config.Category, ttlConf config.TTL, db cache.DB, salt string) error { + // Capture start time. + startTime := time.Now() + // Parse form data (including query params). if err := r.ParseForm(); err != nil { // Server error. @@ -150,7 +154,7 @@ func routeSearch(w http.ResponseWriter, r *http.Request, catsConf map[category.N } // Search for results. - scrapedRes, dur, err := search.Search(query, categoryName, opts, catsConf[categoryName]) + scrapedRes, err := search.Search(query, categoryName, opts, catsConf[categoryName]) if err != nil { // Server error. werr := writeResponseJSON(w, http.StatusInternalServerError, ErrorResponse{ @@ -181,7 +185,7 @@ func routeSearch(w http.ResponseWriter, r *http.Request, catsConf map[category.N // Create the response. res := ResultsResponse{ Version: cli.VersionString(), - Duration: dur.Milliseconds(), + Duration: time.Since(startTime).Milliseconds(), Results: outpusRes, } diff --git a/src/search/search.go b/src/search/search.go index 597681ff..421e9918 100644 --- a/src/search/search.go +++ b/src/search/search.go @@ -15,12 +15,12 @@ import ( "github.com/hearchco/agent/src/utils/anonymize" ) -func Search(query string, category category.Name, opts options.Options, catConf config.Category) ([]result.Result, time.Duration, error) { +func Search(query string, category category.Name, opts options.Options, catConf config.Category) ([]result.Result, error) { // Capture start time. startTime := time.Now() if err := validateParams(query, opts); err != nil { - return nil, time.Since(startTime), err + return nil, err } log.Debug(). @@ -109,5 +109,5 @@ func Search(query string, category category.Name, opts options.Options, catConf Msg("Scraping finished") // Return the results. - return results, time.Since(startTime), nil + return results, nil }