]> Sergey Matveev's repositories - btrtrc.git/commitdiff
Merge branch 'circleci'
authorMatt Joiner <anacrolix@gmail.com>
Thu, 12 Apr 2018 07:28:13 +0000 (17:28 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Thu, 12 Apr 2018 07:28:13 +0000 (17:28 +1000)
# Conflicts:
# client.go

1  2 
client.go

diff --cc client.go
index 43c79f5c958874e8baebfe1c01270963e2ce78e7,db9c9b0734320f3803130f94c93a4030610f715e..eec8ad6338bcc18c92d8a0dbfc05b80485b5c118
+++ b/client.go
@@@ -102,9 -102,10 +102,9 @@@ func (cl *Client) LocalPort() (port int
  
  func writeDhtServerStatus(w io.Writer, s *dht.Server) {
        dhtStats := s.Stats()
 -      fmt.Fprintf(w, "\tDHT nodes: %d (%d good, %d banned)\n", dhtStats.Nodes, dhtStats.GoodNodes, dhtStats.BadNodes)
 -      fmt.Fprintf(w, "\tDHT Server ID: %x\n", s.ID())
 -      fmt.Fprintf(w, "\tDHT port: %d\n", missinggo.AddrPort(s.Addr()))
 -      fmt.Fprintf(w, "\tDHT announces: %d\n", dhtStats.SuccessfulOutboundAnnouncePeerQueries)
 +      fmt.Fprintf(w, "\t# Nodes: %d (%d good, %d banned)\n", dhtStats.Nodes, dhtStats.GoodNodes, dhtStats.BadNodes)
 +      fmt.Fprintf(w, "\tServer ID: %x\n", s.ID())
-       fmt.Fprintf(w, "\tAnnounces: %d\n", dhtStats.ConfirmedAnnounces)
++      fmt.Fprintf(w, "\tAnnounces: %d\n", dhtStats.SuccessfulOutboundAnnouncePeerQueries)
        fmt.Fprintf(w, "\tOutstanding transactions: %d\n", dhtStats.OutstandingTransactions)
  }