get rid of redundant n_api_tries

.env.example

@@ -1,5 +1,4 @@
 DSN=mydbname.db
 DB_POOL_SIZE=100
 YT_API_KEYS=ALzaSyAWJfmC4-ZSNd0ntT3even_tryMA9B7tBQ,AIzaSyAUwQwQsherenxjjLTSVtheH0d1vOsam0o
-YT_API_MAX_TRIES=100
 LETSENCRYPT_EMAIL=[email protected]

app/conf/conf.go

@@ -9,7 +9,6 @@ import (
 
 type Config struct {
 	YtApiKeys     []string
-	YtApiMaxTries int
 	DSN           string
 	DbPoolSize int
 }
@@ -30,11 +29,6 @@ func ParseConfig() *Config {
 	}
 	config.YtApiKeys = strings.Split(ytApiKeys, ",")
 
-	config.YtApiMaxTries, _ = strconv.Atoi(os.Getenv("YT_API_MAX_TRIES"))
-	if config.YtApiMaxTries == 0 {
-		config.YtApiMaxTries = 100
-	}
-
 	config.DbPoolSize, _ = strconv.Atoi(os.Getenv("DB_POOL_SIZE"))
 	if config.DbPoolSize == 0 {
 		config.DbPoolSize = 100

app/handlers/random_hander.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -251,7 +252,10 @@ func (s *Router) GetRandom(w http.ResponseWriter, r *http.Request) {
 	visitor := r.Header.Get("visitor")
 	params := r.URL.Query()
 
-	conn := s.db.Get(r.Context())
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(time.Second*60))
+	defer cancel()
+
+	conn := s.db.Get(ctx)
 	defer s.db.Put(conn)
 
 	searchCriteria := ParseQueryParams(params)

app/youtube/utils.go

@@ -17,7 +17,7 @@ func (y *YouTubeRequester) Request(req *http.Request) (*http.Response, error) {
 	// Just wrap http.Get to add http code errors
 	// retries with fresh api keys if provided
 
-	for i := 1; i < y.conf.YtApiMaxTries; i++ {
+	for {
 		q := req.URL.Query()
 		q.Add("key", y.conf.YtApiKeys[y.currentApiKeyN])
 		req.URL.RawQuery = q.Encode()
@@ -38,7 +38,6 @@ func (y *YouTubeRequester) Request(req *http.Request) (*http.Response, error) {
 		}
 		return res, err
 	}
-	return nil, ErrorMaxTries
 }
 
 const base64range string = "0123456789abcdefghijklmnopqrstuvwxyz-_"