diff --git a/network/gateway/sender.go b/network/gateway/sender.go index d689a91dac3794f8c49e4e7039a0533d2b1b2ed7..ddd41478cc7845347bd5adde640794766cf9cc8f 100644 --- a/network/gateway/sender.go +++ b/network/gateway/sender.go @@ -102,8 +102,8 @@ func (s *Sender) SendToPreferred(targets []*id.ID, for targetIdx := range proxies { target := targets[targetIdx] targetProxies := proxies[targetIdx] - if !(int(proxyIdx)<len(targetProxies)){ - jww.WARN.Printf("Failed to send to proxy %d on target %d (%s) " + + if !(int(proxyIdx) < len(targetProxies)) { + jww.WARN.Printf("Failed to send to proxy %d on target %d (%s) "+ "due to not enough proxies (only %d), skipping attempt", proxyIdx, targetIdx, target, len(targetProxies)) continue diff --git a/storage/session.go b/storage/session.go index f8d543d4a0c65f4720a734fe9f86f4942de5bf38..fd98a85c22e1d1c3aea073ad3d1d9d6a709c6e1c 100644 --- a/storage/session.go +++ b/storage/session.go @@ -46,9 +46,9 @@ const currentSessionVersion = 0 // Session object, backed by encrypted filestore type Session struct { - kv *versioned.KV + kv *versioned.KV - mux sync.RWMutex + mux sync.RWMutex //memoized data regStatus RegistrationStatus @@ -79,9 +79,8 @@ func initStore(baseDir, password string) (*Session, error) { "Failed to create storage session") } - s = &Session{ - kv: versioned.NewKV(fs), + kv: versioned.NewKV(fs), } return s, nil