Skip to content

Commit

Permalink
Bump up TLS timeout in test configs
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Treat committed Jun 7, 2017
1 parent 648b736 commit 4c33177
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions server/configs/tls_test.conf
Expand Up @@ -6,4 +6,5 @@ listen: localhost:4443
tls {
cert_file: "./configs/certs/server.pem"
key_file: "./configs/certs/key.pem"
timeout: 2
}
1 change: 1 addition & 0 deletions server/configs/tls_verify_test.conf
Expand Up @@ -8,4 +8,5 @@ tls {
key_file: "./configs/certs/key.new.pem"
ca_file: "./configs/certs/cert.new.pem"
verify: true
timeout: 2
}
3 changes: 3 additions & 0 deletions server/reload.go
Expand Up @@ -120,6 +120,9 @@ func (s *Server) diffOptions(newOpts *Options) ([]option, error) {
diffOpts = append(diffOpts, &debugOption{newValue.(bool)})
case "tlsconfig":
diffOpts = append(diffOpts, &tlsOption{newValue.(*tls.Config)})
case "tlstimeout":
// TLSTimeout change is picked up when Options is swapped.
continue
default:
// Bail out if attempting to reload any unsupported options.
return nil, fmt.Errorf("Config reload not supported for %s", field.Name)
Expand Down

0 comments on commit 4c33177

Please sign in to comment.