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

Better site lock violation logging

Browse source
This commit is contained in:
shortcutme 2017-04-10 12:18:21 +02:00
parent d7db7a8060
commit 25bb14037c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/File/FileRequest.py
View file

@ -59,7 +59,10 @@ class FileRequest(object):
valid_sites = self.connection.getValidSites() valid_sites = self.connection.getValidSites()
if params["site"] not in valid_sites: if params["site"] not in valid_sites:
self.response({"error": "Invalid site"}) 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) self.connection.badAction(5)
return False return False
@ -76,7 +79,10 @@ class FileRequest(object):
if cmd not in ["getFile", "streamFile"]: # Skip IO bound functions if cmd not in ["getFile", "streamFile"]: # Skip IO bound functions
s = time.time() s = time.time()
if self.connection.cpu_time > 0.5: 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) time.sleep(self.connection.cpu_time)
if self.connection.cpu_time > 5: if self.connection.cpu_time > 5:
self.connection.close("Cpu time: %.3fs" % self.connection.cpu_time) self.connection.close("Cpu time: %.3fs" % self.connection.cpu_time)