octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from canton7/feature/pool-logging

Browse Source 
Enable extra logging in pool.go even when -debug not specified
This commit is contained in:
Audrius Butkevicius 2015-11-06 13:51:46 +00:00
commit 567aaf87c6
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/relaysrv/pool.go
View File

@ -26,9 +26,7 @@ func poolHandler(pool string, uri *url.URL) {
resp, err := http.Post(pool, "application/json", &b) resp, err := http.Post(pool, "application/json", &b)
if err != nil { if err != nil {
if debug {
log.Println("Error joining pool", pool, err) log.Println("Error joining pool", pool, err)
}
} else if resp.StatusCode == 500 { } else if resp.StatusCode == 500 {
if debug { if debug {
bs, err := ioutil.ReadAll(resp.Body) bs, err := ioutil.ReadAll(resp.Body)
@ -38,17 +36,15 @@ func poolHandler(pool string, uri *url.URL) {
log.Println("Response for", pool, string(bs)) log.Println("Response for", pool, string(bs))
} }
resp.Body.Close() resp.Body.Close()
} else {
log.Println(pool, "failed to join due to an internal server error")
} }
} else if resp.StatusCode == 429 { } else if resp.StatusCode == 429 {
if debug {
log.Println(pool, "under load, will retry in a minute") log.Println(pool, "under load, will retry in a minute")
}
time.Sleep(time.Minute) time.Sleep(time.Minute)
continue continue
} else if resp.StatusCode == 403 { } else if resp.StatusCode == 403 {
if debug { log.Println(pool, "failed to join due to IP address not matching external address. Aborting")
log.Println(pool, "failed to join due to IP address not matching external address")
}
return return
} else if resp.StatusCode == 200 { } else if resp.StatusCode == 200 {
var x struct { var x struct {
@ -60,9 +56,11 @@ func poolHandler(pool string, uri *url.URL) {
log.Println("Joined", pool, "rejoining in", rejoin) log.Println("Joined", pool, "rejoining in", rejoin)
time.Sleep(rejoin) time.Sleep(rejoin)
continue continue
} else if debug { } else {
log.Println("Failed to deserialize response", err) log.Println("Failed to deserialize response", err)
} }
} else {
log.Println(pool, "unknown response type from server", resp.StatusCode)
} }
time.Sleep(time.Hour) time.Sleep(time.Hour)
} }