extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-21 16:03:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixups

Browse Source 
cc @asomers
This commit is contained in:
Christian Schwarz 2021-10-09 15:37:03 +02:00
parent fc9c9b184e
commit 83e8bd8b8f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
transport/tls/issue-517/main.go
View File

@ -7,6 +7,7 @@ import (
"log" "log"
"os" "os"
"strings" "strings"
"time"
"github.com/zrepl/zrepl/config" "github.com/zrepl/zrepl/config"
"github.com/zrepl/zrepl/transport/tls" "github.com/zrepl/zrepl/transport/tls"
@ -16,6 +17,7 @@ var servConf = config.TLSServe{
ServeCommon: config.ServeCommon{ ServeCommon: config.ServeCommon{
Type: "tls", Type: "tls",
}, },
HandshakeTimeout: 10 * time.Second,
} }
var clientConf = config.TLSConnect{ var clientConf = config.TLSConnect{
@ -27,7 +29,7 @@ var clientConf = config.TLSConnect{
Cert: "", Cert: "",
Key: "", Key: "",
ServerCN: "", ServerCN: "",
DialTimeout: 0, DialTimeout: 10 * time.Second,
} }
var ca string var ca string
@ -91,22 +93,27 @@ func server() {
go func() { go func() {
defer conn.Close() defer conn.Close()
log.Printf("handling connection %s", conn) log.Printf("handling connection %s", conn.RemoteAddr())
_, err = io.Copy(conn, strings.NewReader("here is the server\n")) _, err = io.Copy(conn, strings.NewReader("here is the server\n"))
if err != nil { if err != nil {
log.Printf("%s: respond to client error: %s", conn, err) log.Printf("%s: respond to client error: %s", conn.RemoteAddr(), err)
return return
} }
log.Printf("%s: waiting for client to close connection", conn) err = conn.CloseWrite()
if err != nil {
log.Printf("%s: failed to close write connection: err", conn.RemoteAddr(), err)
}
log.Printf("%s: waiting for client to close connection", conn.RemoteAddr())
_, err = io.Copy(io.Discard, conn) _, err = io.Copy(io.Discard, conn)
if err != nil { if err != nil {
log.Printf("%s: error draining client connection: %s", conn, err) log.Printf("%s: error draining client connection: %s", conn.RemoteAddr(), err)
return return
} }
log.Printf("%s: done", conn) log.Printf("%s: done", conn.RemoteAddr())
return return
}() }()
} }