Improve logging

Author: triole

src/conf/conf.go

@@ -10,14 +10,6 @@ import (
 	yaml "gopkg.in/yaml.v3"
 )
 
-// func (conf Conf) newConf() Conf {
-// 	m := make(map[string]Endpoint)
-// 	return Conf{
-// 		Port: 0,
-// 		API:  m,
-// 	}
-// }
-
 func (conf *Conf) readConfig() {
 	var content ConfContent
 	by, err := os.ReadFile(conf.FileName)

src/indexer/cache.go

@@ -1,6 +1,10 @@
 package indexer
 
-import cache "github.com/patrickmn/go-cache"
+import (
+	"time"
+
+	cache "github.com/patrickmn/go-cache"
+)
 
 func (ind Indexer) setTapIndexCache(key string, val TapIndex) {
 	ind.Cache.Set(key, val, cache.DefaultExpiration)
@@ -13,6 +17,14 @@ func (ind Indexer) getTapIndexCache(key string) (val TapIndex) {
 	return
 }
 
+func (ind Indexer) getTapIndexCacheWithExpiration(key string) (val TapIndex, tim time.Time) {
+	if x, t, found := ind.Cache.GetWithExpiration(key); found {
+		val = x.(TapIndex)
+		tim = t
+	}
+	return
+}
+
 func (ind Indexer) flushCache() {
 	ind.Cache.Flush()
 }

src/indexer/req.go

@@ -22,11 +22,13 @@ func (ind Indexer) req(targetURL, method string) (data []byte, err error) {
 	)
 	ind.Lg.IfErrError("can not init request", logseal.F{"error": err})
 
-	response, err := client.Do(request)
-	ind.Lg.IfErrError("request failed", logseal.F{"error": err})
+	resp, err := client.Do(request)
+	ind.Lg.IfErrError(
+		"request failed",
+		logseal.F{"error": err})
 
 	if err == nil {
-		data, err = io.ReadAll(response.Body)
+		data, err = io.ReadAll(resp.Body)
 		ind.Lg.IfErrError(
 			"unable to read request response", logseal.F{"error": err},
 		)

src/indexer/server.go

@@ -25,7 +25,7 @@ func (ind Indexer) RunServer() {
 }
 
 func (ind Indexer) ServeContent(w http.ResponseWriter, r *http.Request) {
-	ind.Lg.Info("got request", logseal.F{"url": r.URL})
+	ind.Lg.Debug("got request", logseal.F{"url": r.URL})
 	params := Params{
 		Ascending: true,
 		Filter:    FilterParams{Enabled: false},
@@ -60,7 +60,7 @@ func (ind Indexer) ServeContent(w http.ResponseWriter, r *http.Request) {
 		start := time.Now()
 		params.Endpoint = val
 		ind.UpdateTapIndex(params)
-		ind.Lg.Debug(
+		ind.Lg.Info(
 			"serve json",
 			logseal.F{
 				"url": url, "path": val.Source, "rxfilter": val.RxFilter, "duration": time.Since(start),

src/indexer/ti.go

@@ -14,7 +14,7 @@ func (ind *Indexer) UpdateTapIndex(params Params) {
 	)
 
 	var err error
-	ti := ind.getTapIndexCache(params.Endpoint.Source)
+	ti, tim := ind.getTapIndexCacheWithExpiration(params.Endpoint.Source)
 	if len(ti) < 1 {
 		ind.DataSources.Params = params
 		ind.DataSources.Type = params.Endpoint.SourceType
@@ -61,6 +61,13 @@ func (ind *Indexer) UpdateTapIndex(params Params) {
 		}
 		ti = ti.applyIgnoreList(params)
 		ind.setTapIndexCache(params.Endpoint.Source, ti)
+	} else {
+		ind.Lg.Debug(
+			"return from cache",
+			logseal.F{
+				"key":             params.Endpoint.Source,
+				"expiration_time": tim,
+			})
 	}
 }