Create storage object after site settings loaded

This commit is contained in:
shortcutme 2017-10-04 12:50:24 +02:00
parent 0f0f3894ff
commit 8e3e96fe65
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -52,8 +52,8 @@ class Site(object):
self.websockets = [] # Active site websocket connections self.websockets = [] # Active site websocket connections
self.connection_server = None self.connection_server = None
self.storage = SiteStorage(self, allow_create=allow_create) # Save and load site files
self.loadSettings(settings) # Load settings from sites.json self.loadSettings(settings) # Load settings from sites.json
self.storage = SiteStorage(self, allow_create=allow_create) # Save and load site files
self.content_manager = ContentManager(self) self.content_manager = ContentManager(self)
self.content_manager.loadContents() # Load content.json files self.content_manager.loadContents() # Load content.json files
if "main" in sys.modules and "file_server" in dir(sys.modules["main"]): # Use global file server by default if possible if "main" in sys.modules and "file_server" in dir(sys.modules["main"]): # Use global file server by default if possible