LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Hold amgr lock in {load,save}Peers.

Browse source 
We're traversing internal datastructures here.
This commit is contained in:
Owain G. Ainsworth 2013-10-02 20:27:08 +01:00
parent 70f15f434f
commit 71ea6700a2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
addrmanager.go
View file

@ -418,6 +418,8 @@ type serialisedAddrManager struct {
// savePeers saves all the known addresses to a file so they can be read back // savePeers saves all the known addresses to a file so they can be read back
// in at next run. // in at next run.
func (a *AddrManager) savePeers() { func (a *AddrManager) savePeers() {
a.mtx.Lock()
defer a.mtx.Unlock()
// First we make a serialisable datastructure so we can encode it to // First we make a serialisable datastructure so we can encode it to
// json. // json.
@ -474,6 +476,9 @@ func (a *AddrManager) savePeers() {
// loadPeers loads the known address from the saved file. If empty, missing, or // loadPeers loads the known address from the saved file. If empty, missing, or
// malformed file, just don't load anything and start fresh // malformed file, just don't load anything and start fresh
func (a *AddrManager) loadPeers() { func (a *AddrManager) loadPeers() {
a.mtx.Lock()
defer a.mtx.Unlock()
// May give some way to specify this later. // May give some way to specify this later.
filename := "peers.json" filename := "peers.json"
filePath := filepath.Join(cfg.DataDir, filename) filePath := filepath.Join(cfg.DataDir, filename)
@ -492,7 +497,7 @@ func (a *AddrManager) loadPeers() {
return return
} }
log.Infof("[AMGR] Successfuly loaded %d addresses from %s", log.Infof("[AMGR] Successfuly loaded %d addresses from %s",
a.NumAddresses(), filePath) a.nNew + a.nTried, filePath)
} }
func (a *AddrManager) deserialisePeers(filePath string) error { func (a *AddrManager) deserialisePeers(filePath string) error {