From 31a7effa5f5960da2441b6280df25a022f08801d Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 29 Jan 2019 03:17:24 +0100 Subject: [PATCH] Rev3827, Share FileServer between sites for non-main CLI commands --- src/Config.py | 2 +- src/Site/Site.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index 4e50b34d..f5e5bfe7 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.4" - self.rev = 3826 + self.rev = 3827 self.argv = argv self.action = None self.pending_changes = {} diff --git a/src/Site/Site.py b/src/Site/Site.py index c1e76eea..e388a074 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -56,8 +56,11 @@ class Site(object): if "main" in sys.modules and "file_server" in dir(sys.modules["main"]): # Use global file server by default if possible self.connection_server = sys.modules["main"].file_server else: - self.log.debug("Creating connection server") # remove - self.connection_server = FileServer() + if "main" in sys.modules: + sys.modules["main"].file_server = FileServer() + self.connection_server = sys.modules["main"].file_server + else: + self.connection_server = FileServer() self.announcer = SiteAnnouncer(self) # Announce and get peer list from other nodes