From 90d01e6004544871e87abf5abbcd27c40bb44e2c Mon Sep 17 00:00:00 2001 From: Vadim Ushakov Date: Wed, 4 Nov 2020 09:25:44 +0700 Subject: [PATCH] Fix a tor issue introduced in the latest changes --- src/Connection/ConnectionServer.py | 1 + src/File/FileServer.py | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Connection/ConnectionServer.py b/src/Connection/ConnectionServer.py index b66d1739..20bd165a 100644 --- a/src/Connection/ConnectionServer.py +++ b/src/Connection/ConnectionServer.py @@ -102,6 +102,7 @@ class ConnectionServer(object): CryptConnection.manager.loadCerts() if config.tor != "disable": self.tor_manager.start() + self.tor_manager.startOnions() if not self.port: self.log.info("No port found, not binding") return False diff --git a/src/File/FileServer.py b/src/File/FileServer.py index b228680a..eea34ff0 100644 --- a/src/File/FileServer.py +++ b/src/File/FileServer.py @@ -260,13 +260,8 @@ class FileServer(ConnectionServer): @util.Noparallel(queue=True) def recheckPort(self): - if not self.recheck_port: - return - - if not self.port_opened: + if self.recheck_port: self.portCheck() - if not self.port_opened["ipv4"]: - self.tor_manager.startOnions() self.recheck_port = False # Returns False if Internet is immediately available @@ -322,6 +317,8 @@ class FileServer(ConnectionServer): site.invalidateUpdateTime(invalid_interval) def updateSites(self, check_files=False): + self.recheckPort() + task_nr = self.update_sites_task_next_nr self.update_sites_task_next_nr += 1