Skip to content

Commit 131fba2

Browse files
Fix connect timeout defaults (#297)
Committed-By-Agent: codex Co-authored-by: codex <noreply@openai.com>
1 parent da4840c commit 131fba2

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ smokescreen --max-concurrent-requests=100 --max-request-rate=50 --max-concurrent
152152

153153
**Example (YAML):**
154154
```yaml
155+
connect_timeout: 10s # defaults to 10s; set to 0 to disable the timeout
155156
max_concurrent_requests: 100
156157
max_request_rate: 50
157158
max_request_burst: 150 # optional, defaults to 2x rate

pkg/smokescreen/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ func NewConfig() *Config {
395395
clientCasBySubjectKeyId: make(map[string]*x509.Certificate),
396396
Log: log.New(),
397397
Port: DefaultPort,
398+
ConnectTimeout: DefaultConnectTimeout,
398399
ExitTimeout: DefaultExitTimeout,
399400
StatsSocketFileMode: os.FileMode(DefaultStatsSocketFileMode),
400401
ShuttingDown: atomic.Value{},

pkg/smokescreen/config_loader.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type yamlConfig struct {
3838
AllowMissingRole bool `yaml:"allow_missing_role"`
3939
Network string `yaml:"network"`
4040

41-
ConnectTimeout time.Duration `yaml:"connect_timeout"`
41+
ConnectTimeout *time.Duration `yaml:"connect_timeout"`
4242
IdleTimeout time.Duration `yaml:"idle_timeout"`
4343
ExitTimeout *time.Duration `yaml:"exit_timeout"`
4444

@@ -114,7 +114,9 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
114114
}
115115

116116
c.IdleTimeout = yc.IdleTimeout
117-
c.ConnectTimeout = yc.ConnectTimeout
117+
if yc.ConnectTimeout != nil {
118+
c.ConnectTimeout = *yc.ConnectTimeout
119+
}
118120
if yc.ExitTimeout != nil {
119121
c.ExitTimeout = *yc.ExitTimeout
120122
}

0 commit comments

Comments
 (0)