From b610c588754674d72f6116276e81831b0f5586d2 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Tue, 31 May 2016 08:05:29 +0200
Subject: [PATCH] kademlia: improved logs, fix potential deadlock in String()

---
 swarm/network/kademlia/kaddb.go    | 12 ++++++++----
 swarm/network/kademlia/kademlia.go |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go
index d7c6a5be13..710e32d98d 100644
--- a/swarm/network/kademlia/kaddb.go
+++ b/swarm/network/kademlia/kaddb.go
@@ -32,6 +32,10 @@ func (t Time) Unix() int64 {
 	return time.Time(t).Unix()
 }
 
+func (t Time) String() string {
+	return time.Time(t).Format("2000-01-01 20:41:00")
+}
+
 type NodeData interface {
 	json.Marshaler
 	json.Unmarshaler
@@ -206,7 +210,7 @@ func (self *KadDb) findBest(bucketSize int, binsize func(int) int) (node *NodeRe
 					// skip already connected nodes
 					if !node.connected {
 
-						glog.V(logger.Detail).Infof("[KΛÐ]: kaddb record %v (PO%03d:%d) not to be retried before %v", node.Addr, po, n, node.After)
+						glog.V(logger.Debug).Infof("[KΛÐ]: kaddb record %v (PO%03d:%d) not to be retried before %v", node.Addr, po, n, node.After)
 
 						// time since last known connection attempt
 						delta := node.After.Unix() - node.Seen.Unix()
@@ -221,7 +225,7 @@ func (self *KadDb) findBest(bucketSize int, binsize func(int) int) (node *NodeRe
 							if time.Time(node.Seen).Add(self.purgeInterval).Before(time.Now()) {
 								// delete node
 								purge = append(purge, n)
-								glog.V(logger.Detail).Infof("[KΛÐ]: inactive node record %v (PO%03d:%d) last check: %v, next check: %v", node.Addr, po, n, node.Seen, node.After)
+								glog.V(logger.Debug).Infof("[KΛÐ]: inactive node record %v (PO%03d:%d) last check: %v, next check: %v", node.Addr, po, n, node.Seen, node.After)
 							} else {
 								// scheduling next check
 								if (node.After == Time(time.Time{})) {
@@ -231,12 +235,12 @@ func (self *KadDb) findBest(bucketSize int, binsize func(int) int) (node *NodeRe
 									node.After = Time(time.Unix(time.Now().Unix()+interval, 0))
 								}
 
-								glog.V(logger.Detail).Infof("[KΛÐ]: serve node record %v (PO%03d:%d), last check: %v,  next check: %v", node.Addr, po, n, node.Seen, node.After)
+								glog.V(logger.Debug).Infof("[KΛÐ]: serve node record %v (PO%03d:%d), last check: %v,  next check: %v", node.Addr, po, n, node.Seen, node.After)
 							}
 							found = true
 							break ROW
 						}
-						glog.V(logger.Detail).Infof("[KΛÐ]: kaddb record %v (PO%03d:%d) not ready. skipped. not to be retried before: %v", node.Addr, po, n, node.After)
+						glog.V(logger.Debug).Infof("[KΛÐ]: kaddb record %v (PO%03d:%d) not ready. skipped. not to be retried before: %v", node.Addr, po, n, node.After)
 					} // if node.node == nil
 					n++
 					count++
diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go
index 46e711e8f5..250dbfd9a6 100644
--- a/swarm/network/kademlia/kademlia.go
+++ b/swarm/network/kademlia/kademlia.go
@@ -401,7 +401,7 @@ func (self *Kademlia) String() string {
 
 	var rows []string
 	rows = append(rows, "=========================================================================")
-	rows = append(rows, fmt.Sprintf("KΛÐΞMLIΛ hive: queen's address: %v, population: %d (%d)", self.addr, self.Count(), self.DBCount()))
+	rows = append(rows, fmt.Sprintf("KΛÐΞMLIΛ hive: queen's address: %v, population: %d (%d)", self.addr, self.count, self.DBCount()))
 	rows = append(rows, fmt.Sprintf("%v : MaxProx: %d, ProxBinSize: %d, BucketSize: %d, proxLimit: %d, proxSize: %d", time.Now(), self.MaxProx, self.ProxBinSize, self.BucketSize, self.proxLimit, self.proxSize))
 
 	for i, b := range self.buckets {