felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

cmd/strelaypoolsrv: Expose check error to client, fix incorrect response code handling

Browse Source
This commit is contained in:
Jakob Borg
2020-04-04 13:31:42 +02:00
parent 66262392c3
commit 362da59396
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/strelaypoolsrv/main.go
+3 -4
View File
@@ -10,7 +10,6 @@ import (
"context"
"crypto/tls"
"encoding/json"
"errors"
"flag"
"fmt"
"io"
@@ -491,11 +490,11 @@ func handleRelayTest(request request) {
if debug {
log.Println("Request for", request.relay)
}
if !client.TestRelay(context.TODO(), request.relay.uri, []tls.Certificate{testCert}, time.Second, 2*time.Second, 3) {
if err := client.TestRelay(context.TODO(), request.relay.uri, []tls.Certificate{testCert}, time.Second, 2*time.Second, 3); err != nil {
if debug {
log.Println("Test for relay", request.relay, "failed")
log.Println("Test for relay", request.relay, "failed:", err)
}
request.result <- result{errors.New("connection test failed"), 0}
request.result <- result{err, 0}
return
}
cmd/strelaysrv/testutil/main.go
+2 -2
View File
@@ -107,10 +107,10 @@ func main() {
connectToStdio(stdin, conn)
log.Println("Finished", conn.RemoteAddr(), conn.LocalAddr())
} else if test {
if client.TestRelay(ctx, uri, []tls.Certificate{cert}, time.Second, 2*time.Second, 4) {
if err := client.TestRelay(ctx, uri, []tls.Certificate{cert}, time.Second, 2*time.Second, 4); err == nil {
log.Println("OK")
} else {
log.Println("FAIL")
log.Println("FAIL:", err)
}
} else {
log.Fatal("Requires either join or connect")