Release 2.3.2 into develop #185
|
@ -6,6 +6,7 @@ import (
|
|||
"crypto/tls"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
@ -26,6 +27,7 @@ type TofuDigest struct {
|
|||
}
|
||||
|
||||
var BlockBehavior = "block"
|
||||
var TlsTimeout = time.Duration(15) * time.Second
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + R E C E I V E R S + + + \\
|
||||
|
@ -189,7 +191,7 @@ func Retrieve(host, port, resource string, td *TofuDigest) (string, error) {
|
|||
return &td.ClientCert, nil
|
||||
}
|
||||
|
||||
conn, err := tls.Dial("tcp", addr, conf)
|
||||
conn, err := tls.DialWithDialer(&net.Dialer{Timeout: TlsTimeout}, "tcp", addr, conf)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("TLS Dial Error: %s", err.Error())
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ var types = map[string]string{
|
|||
// be better.
|
||||
func Retrieve(host, port, resource string) ([]byte, error) {
|
||||
nullRes := make([]byte, 0)
|
||||
timeOut := time.Duration(5) * time.Second
|
||||
timeOut := time.Duration(15) * time.Second
|
||||
|
||||
if host == "" || port == "" {
|
||||
return nullRes, errors.New("Incomplete request url")
|
||||
|
|
Loading…
Reference in New Issue