diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py index c2ecbc47..07703300 100644 --- a/src/Content/ContentManager.py +++ b/src/Content/ContentManager.py @@ -627,7 +627,8 @@ class ContentManager(object): valid_signs += CryptBitcoin.verify(sign_content, address, signs[address]) if valid_signs >= signs_required: break # Break if we has enough signs - self.log.debug("%s: Valid signs: %s/%s" % (inner_path, valid_signs, signs_required)) + if config.verbose: + self.log.debug("%s: Valid signs: %s/%s" % (inner_path, valid_signs, signs_required)) return valid_signs >= signs_required else: # Old style signing return CryptBitcoin.verify(sign_content, self.site.address, sign) diff --git a/src/Site/Site.py b/src/Site/Site.py index 85b78229..c432b2f0 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -222,13 +222,16 @@ class Site(object): continue # Failed query queried.append(peer) + num_modified = 0 for inner_path, modified in res["modified_files"].iteritems(): # Check if the peer has newer files than we content = self.content_manager.contents.get(inner_path) if (not content or modified > content["modified"]) and inner_path not in self.bad_files: - self.log.debug("New modified file from %s: %s" % (peer, inner_path)) + num_modified += 1 # We dont have this file or we have older self.bad_files[inner_path] = self.bad_files.get(inner_path, 0) + 1 # Mark as bad file gevent.spawn(self.downloadContent, inner_path) # Download the content.json + the changed files + if num_modified > 0: + self.log.debug("%s new modified file from %s" % (num_modified, peer)) # Check modified content.json files from peers and add modified files to bad_files # Return: Successfully queried peers [Peer, Peer...] @@ -889,7 +892,8 @@ class Site(object): def fileDone(self, inner_path): # File downloaded, remove it from bad files if inner_path in self.bad_files: - self.log.debug("Bad file solved: %s" % inner_path) + if config.verbose: + self.log.debug("Bad file solved: %s" % inner_path) del(self.bad_files[inner_path]) # Update content.json last downlad time diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index 284984c4..c55a0a2b 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -189,7 +189,8 @@ class SiteStorage: self.closeDb() self.openDb() elif not config.disable_db and inner_path.endswith(".json") and self.has_db: # Load json file to db - self.log.debug("Loading json file to db: %s" % inner_path) + if config.verbose: + self.log.debug("Loading json file to db: %s" % inner_path) try: self.getDb().loadJson(file_path) except Exception, err: diff --git a/src/Worker/Worker.py b/src/Worker/Worker.py index 1d0e9fe2..bdeb2431 100644 --- a/src/Worker/Worker.py +++ b/src/Worker/Worker.py @@ -3,6 +3,7 @@ import time import gevent from Debug import Debug +from Config import config class Worker(object): @@ -34,9 +35,11 @@ class Worker(object): task["time_started"] = time.time() # Task started now if task["workers_num"] > 0: # Wait a bit if someone already working on it - self.manager.log.debug("%s: Someone already working on %s, sleeping 1 sec..." % (self.key, task["inner_path"])) + if config.verbose: + self.manager.log.debug("%s: Someone already working on %s, sleeping 1 sec..." % (self.key, task["inner_path"])) time.sleep(1) - self.manager.log.debug("%s: %s, task done after sleep: %s" % (self.key, task["inner_path"], task["done"])) + if config.verbose: + self.manager.log.debug("%s: %s, task done after sleep: %s" % (self.key, task["inner_path"], task["done"])) if task["done"] is False: self.task = task