From 25bb14037c36a7f3931807b4497daf0f0968520d Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 10 Apr 2017 12:18:21 +0200 Subject: [PATCH] Better site lock violation logging --- src/File/FileRequest.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index 193c0a15..23470bdd 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -59,7 +59,10 @@ class FileRequest(object): valid_sites = self.connection.getValidSites() if params["site"] not in valid_sites: self.response({"error": "Invalid site"}) - self.log.error("Site lock violation: %s not in %s" % (params["site"], valid_sites)) + self.connection.log( + "%s site lock violation: %s not in %s, target onion: %s" % + (params["site"], valid_sites, self.connection.target_onion) + ) self.connection.badAction(5) return False @@ -76,7 +79,10 @@ class FileRequest(object): if cmd not in ["getFile", "streamFile"]: # Skip IO bound functions s = time.time() if self.connection.cpu_time > 0.5: - self.log.debug("Delay %s %s, cpu_time used by connection: %.3fs" % (self.connection.ip, cmd, self.connection.cpu_time)) + self.log.debug( + "Delay %s %s, cpu_time used by connection: %.3fs" % + (self.connection.ip, cmd, self.connection.cpu_time) + ) time.sleep(self.connection.cpu_time) if self.connection.cpu_time > 5: self.connection.close("Cpu time: %.3fs" % self.connection.cpu_time)