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

Optimize getOnion function with less lock

Browse source
This commit is contained in:
shortcutme 2019-01-20 16:51:42 +01:00
parent 00972f5d73
commit 468666cdc8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Tor/TorManager.py
View file

@ -312,18 +312,21 @@ class TorManager(object):
return CryptRsa.privatekeyToPublickey(self.privatekeys[address]) return CryptRsa.privatekeyToPublickey(self.privatekeys[address])
def getOnion(self, site_address): def getOnion(self, site_address):
with self.lock:
if not self.enabled: if not self.enabled:
return None return None
if config.tor == "always": # Different onion for every site if config.tor == "always": # Different onion for every site
onion = self.site_onions.get(site_address) onion = self.site_onions.get(site_address)
else: # Same onion for every site else: # Same onion for every site
onion = self.site_onions.get("global") onion = self.site_onions.get("global")
site_address = "global" site_address = "global"
if not onion: if not onion:
with self.lock:
self.site_onions[site_address] = self.addOnion() self.site_onions[site_address] = self.addOnion()
onion = self.site_onions[site_address] onion = self.site_onions[site_address]
self.log.debug("Created new hidden service for %s: %s" % (site_address, onion)) self.log.debug("Created new hidden service for %s: %s" % (site_address, onion))
return onion return onion
# Creates and returns a # Creates and returns a