oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Less verbose tracker logging

Browse source
This commit is contained in:
shortcutme 2018-04-29 01:01:13 +02:00
parent ef8e8c5a30
commit 5a494ca50e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Site/SiteAnnouncer.py
View file

@ -73,7 +73,8 @@ class SiteAnnouncer(object):
trackers = self.getAnnouncingTrackers(mode) trackers = self.getAnnouncingTrackers(mode)
self.site.log.debug("Tracker announcing, trackers: %s" % trackers) if config.verbose:
self.site.log.debug("Tracker announcing, trackers: %s" % trackers)
errors = [] errors = []
slow = [] slow = []
@ -110,11 +111,10 @@ class SiteAnnouncer(object):
announced_to = trackers[0] announced_to = trackers[0]
else: else:
announced_to = "%s/%s trackers" % (num_announced, len(threads)) announced_to = "%s/%s trackers" % (num_announced, len(threads))
if config.verbose or 1 == 1: # remove self.site.log.debug(
self.site.log.debug( "Announced in mode %s to %s in %.3fs, errors: %s, slow: %s" %
"Announced in mode %s to %s in %.3fs, errors: %s, slow: %s" % (mode, announced_to, time.time() - s, errors, slow)
(mode, announced_to, time.time() - s, errors, slow) )
)
else: else:
if len(threads) > 1: if len(threads) > 1:
self.site.log.error("Announce to %s trackers in %.3fs, failed" % (num_announced, time.time() - s)) self.site.log.error("Announce to %s trackers in %.3fs, failed" % (num_announced, time.time() - s))
@ -148,7 +148,8 @@ class SiteAnnouncer(object):
self.stats[tracker]["status"] = "announcing" self.stats[tracker]["status"] = "announcing"
self.stats[tracker]["time_status"] = time.time() self.stats[tracker]["time_status"] = time.time()
self.stats[tracker]["num_request"] += 1 self.stats[tracker]["num_request"] += 1
self.site.log.debug("Tracker announcing to %s (mode: %s)" % (tracker, mode)) if config.verbose:
self.site.log.debug("Tracker announcing to %s (mode: %s)" % (tracker, mode))
if mode == "update": if mode == "update":
num_want = 10 num_want = 10
else: else:
@ -195,10 +196,11 @@ class SiteAnnouncer(object):
self.site.worker_manager.onPeers() self.site.worker_manager.onPeers()
self.site.updateWebsocket(peers_added=added) self.site.updateWebsocket(peers_added=added)
self.site.log.debug( if config.verbose:
"Tracker result: %s://%s (found %s peers, new: %s, total: %s)" % self.site.log.debug(
(protocol, address, len(peers), added, len(self.site.peers)) "Tracker result: %s://%s (found %s peers, new: %s, total: %s)" %
) (protocol, address, len(peers), added, len(self.site.peers))
)
return time.time() - s return time.time() - s
def announceTrackerUdp(self, tracker_address, mode="start", num_want=10): def announceTrackerUdp(self, tracker_address, mode="start", num_want=10):