Load all sites on commands to avoid errors
This commit is contained in:
parent
c38611dc15
commit
d5210d27e2
1 changed files with 21 additions and 0 deletions
21
src/main.py
21
src/main.py
|
@ -166,6 +166,9 @@ class Actions(object):
|
||||||
|
|
||||||
logging.info("Creating directory structure...")
|
logging.info("Creating directory structure...")
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
os.mkdir("%s/%s" % (config.data_dir, address))
|
os.mkdir("%s/%s" % (config.data_dir, address))
|
||||||
open("%s/%s/index.html" % (config.data_dir, address), "w").write("Hello %s!" % address)
|
open("%s/%s/index.html" % (config.data_dir, address), "w").write("Hello %s!" % address)
|
||||||
|
|
||||||
|
@ -179,6 +182,8 @@ class Actions(object):
|
||||||
|
|
||||||
def siteSign(self, address, privatekey=None, inner_path="content.json", publish=False):
|
def siteSign(self, address, privatekey=None, inner_path="content.json", publish=False):
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
logging.info("Signing site: %s..." % address)
|
logging.info("Signing site: %s..." % address)
|
||||||
site = Site(address, allow_create=False)
|
site = Site(address, allow_create=False)
|
||||||
|
|
||||||
|
@ -202,6 +207,9 @@ class Actions(object):
|
||||||
def siteVerify(self, address):
|
def siteVerify(self, address):
|
||||||
import time
|
import time
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
s = time.time()
|
s = time.time()
|
||||||
logging.info("Verifing site: %s..." % address)
|
logging.info("Verifing site: %s..." % address)
|
||||||
site = Site(address)
|
site = Site(address)
|
||||||
|
@ -231,6 +239,7 @@ class Actions(object):
|
||||||
from Site import Site
|
from Site import Site
|
||||||
from Site import SiteManager
|
from Site import SiteManager
|
||||||
SiteManager.site_manager.load()
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
logging.info("Rebuilding site sql cache: %s..." % address)
|
logging.info("Rebuilding site sql cache: %s..." % address)
|
||||||
site = SiteManager.site_manager.get(address)
|
site = SiteManager.site_manager.get(address)
|
||||||
s = time.time()
|
s = time.time()
|
||||||
|
@ -239,6 +248,9 @@ class Actions(object):
|
||||||
|
|
||||||
def dbQuery(self, address, query):
|
def dbQuery(self, address, query):
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
import json
|
import json
|
||||||
site = Site(address)
|
site = Site(address)
|
||||||
result = []
|
result = []
|
||||||
|
@ -248,6 +260,9 @@ class Actions(object):
|
||||||
|
|
||||||
def siteAnnounce(self, address):
|
def siteAnnounce(self, address):
|
||||||
from Site.Site import Site
|
from Site.Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
logging.info("Announcing site %s to tracker..." % address)
|
logging.info("Announcing site %s to tracker..." % address)
|
||||||
site = Site(address)
|
site = Site(address)
|
||||||
|
|
||||||
|
@ -258,6 +273,8 @@ class Actions(object):
|
||||||
|
|
||||||
def siteDownload(self, address):
|
def siteDownload(self, address):
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
logging.info("Opening a simple connection server")
|
logging.info("Opening a simple connection server")
|
||||||
global file_server
|
global file_server
|
||||||
|
@ -285,6 +302,8 @@ class Actions(object):
|
||||||
|
|
||||||
def siteNeedFile(self, address, inner_path):
|
def siteNeedFile(self, address, inner_path):
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
def checker():
|
def checker():
|
||||||
while 1:
|
while 1:
|
||||||
|
@ -305,8 +324,10 @@ class Actions(object):
|
||||||
def sitePublish(self, address, peer_ip=None, peer_port=15441, inner_path="content.json", diffs={}):
|
def sitePublish(self, address, peer_ip=None, peer_port=15441, inner_path="content.json", diffs={}):
|
||||||
global file_server
|
global file_server
|
||||||
from Site import Site
|
from Site import Site
|
||||||
|
from Site import SiteManager
|
||||||
from File import FileServer # We need fileserver to handle incoming file requests
|
from File import FileServer # We need fileserver to handle incoming file requests
|
||||||
from Peer import Peer
|
from Peer import Peer
|
||||||
|
SiteManager.site_manager.load()
|
||||||
|
|
||||||
logging.info("Loading site...")
|
logging.info("Loading site...")
|
||||||
site = Site(address, allow_create=False)
|
site = Site(address, allow_create=False)
|
||||||
|
|
Loading…
Reference in a new issue