Skip to content

Commit 29b1b60

Browse files
committed
Remove timeout from main.go
Fix rebase more Fix rebase more
1 parent 8b84aad commit 29b1b60

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/config/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ type Config struct {
2222
Persist bool
2323
System string `env:"EXPLO_SYSTEM"`
2424
Debug bool `env:"DEBUG" env-default:"false"`
25+
<<<<<<< HEAD
2526
LogLevel string `env:"LOG_LEVEL" env-default:"INFO"`
27+
=======
28+
>>>>>>> 2065c16 (Remove timeout from main.go)
2629
}
2730

2831
type Flags struct {

src/main/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"log"
66
"log/slog"
77
"os"
8-
"time"
98

109
"explo/src/client"
1110
"explo/src/config"
@@ -20,9 +19,9 @@ type Song struct {
2019
Album string
2120
}
2221

23-
func initHttpClient(cfg *config.Config) *util.HttpClient {
22+
func initHttpClient() *util.HttpClient {
2423
return util.NewHttp(util.HttpClientConfig{
25-
Timeout: time.Duration(cfg.Timeout) * time.Second,
24+
Timeout: 10,
2625
})
2726
}
2827

0 commit comments

Comments
 (0)