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

cmd/strelaysrv: Fix JSON unmarshalling when joining a relay pool (fixes #6733) (#6729)

Browse Source
This commit is contained in:
Gleb Sinyavskiy
2020-06-10 11:26:09 +02:00
committed by GitHub
parent b6b6caeab5
commit 091cb5e611
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/strelaysrv/pool.go
+1 -1
View File
@@ -51,7 +51,7 @@ func poolHandler(pool string, uri *url.URL, mapping mapping) {
var x struct { var x struct {
EvictionIn time.Duration `json:"evictionIn"` EvictionIn time.Duration `json:"evictionIn"`
} }
if err := json.NewDecoder(resp.Body).Decode(&x); err == nil { if err := json.Unmarshal(bs, &x); err == nil {
rejoin := x.EvictionIn - (x.EvictionIn / 5) rejoin := x.EvictionIn - (x.EvictionIn / 5)
log.Printf("Joined pool %s, rejoining in %v", pool, rejoin) log.Printf("Joined pool %s, rejoining in %v", pool, rejoin)
time.Sleep(rejoin) time.Sleep(rejoin)