Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-07-15 12:58:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove IPv4/IPv6 stats specializations and replace with RecordPeerEvent

Browse Source
This commit is contained in:
Justin Li
2014-07-22 23:41:20 -04:00
parent 11d06f7830
commit ce2e335562
3 changed files with 86 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tracker/announce.go
+5 -26
View File
@@ -120,11 +120,7 @@ func updateSwarm(c Conn, ann *models.Announce, p *models.Peer, t *models.Torrent
return
}
t.Seeders[p.ID] = *p
if p.IPv4() {
stats.RecordEvent(stats.NewSeedIPv4)
} else {
stats.RecordEvent(stats.NewSeedIPv6)
}
stats.RecordPeerEvent(stats.NewSeed, p.IPv6())
} else {
err = c.PutLeecher(t.Infohash, p)
@@ -132,11 +128,7 @@ func updateSwarm(c Conn, ann *models.Announce, p *models.Peer, t *models.Torrent
return
}
t.Leechers[p.ID] = *p
if p.IPv4() {
stats.RecordEvent(stats.NewLeechIPv4)
} else {
stats.RecordEvent(stats.NewLeechIPv6)
}
stats.RecordPeerEvent(stats.NewLeech, p.IPv6())
}
created = true
}
@@ -155,11 +147,7 @@ func handleEvent(c Conn, ann *models.Announce, p *models.Peer, u *models.User, t
return
}
delete(t.Seeders, p.ID)
if p.IPv4() {
stats.RecordEvent(stats.DeletedSeedIPv4)
} else {
stats.RecordEvent(stats.DeletedSeedIPv6)
}
stats.RecordPeerEvent(stats.DeletedSeed, p.IPv6())
} else if t.InLeecherPool(p) {
err = c.DeleteLeecher(t.Infohash, p.ID)
@@ -167,11 +155,7 @@ func handleEvent(c Conn, ann *models.Announce, p *models.Peer, u *models.User, t
return
}
delete(t.Leechers, p.ID)
if p.IPv4() {
stats.RecordEvent(stats.DeletedLeechIPv4)
} else {
stats.RecordEvent(stats.DeletedLeechIPv6)
}
stats.RecordPeerEvent(stats.DeletedLeech, p.IPv6())
}
case ann.Event == "completed":
@@ -212,12 +196,7 @@ func leecherFinished(c Conn, infohash string, p *models.Peer) error {
return err
}
if p.IPv4() {
stats.RecordEvent(stats.CompletedIPv4)
} else {
stats.RecordEvent(stats.CompletedIPv6)
}
stats.RecordPeerEvent(stats.Completed, p.IPv6())
return nil
}
tracker/memory/conn.go
+2 -12
View File
@@ -271,24 +271,14 @@ func (c *Conn) PurgeInactivePeers(purgeEmptyTorrents bool, before time.Time) err
for key, peer := range torrent.Seeders {
if peer.LastAnnounce <= unixtime {
delete(torrent.Seeders, key)
if peer.IPv4() {
stats.RecordEvent(stats.ReapedSeedIPv4)
} else {
stats.RecordEvent(stats.ReapedSeedIPv6)
}
stats.RecordPeerEvent(stats.ReapedSeed, peer.IPv6())
}
}
for key, peer := range torrent.Leechers {
if peer.LastAnnounce <= unixtime {
delete(torrent.Leechers, key)
if peer.IPv4() {
stats.RecordEvent(stats.ReapedLeechIPv4)
} else {
stats.RecordEvent(stats.ReapedLeechIPv6)
}
stats.RecordPeerEvent(stats.ReapedLeech, peer.IPv6())
}
}