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

Add own logger to SiteManager

Browse source
This commit is contained in:
ZeroNet 2016-08-10 12:32:28 +02:00
parent 0569697d98
commit 53249f4f07
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Site/SiteManager.py
View file

@ -14,11 +14,14 @@ from util import helper
@PluginManager.acceptPlugins @PluginManager.acceptPlugins
class SiteManager(object): class SiteManager(object):
def __init__(self): def __init__(self):
self.log = logging.getLogger("SiteManager")
self.log.debug("Sitemanger created.")
self.sites = None self.sites = None
gevent.spawn(self.saveTimer) gevent.spawn(self.saveTimer)
# Load all sites from data/sites.json # Load all sites from data/sites.json
def load(self): def load(self):
self.log.debug("Loading sites...")
from Site import Site from Site import Site
if not self.sites: if not self.sites:
self.sites = {} self.sites = {}
@ -29,7 +32,7 @@ class SiteManager(object):
if address not in self.sites and os.path.isfile("%s/%s/content.json" % (config.data_dir, address)): if address not in self.sites and os.path.isfile("%s/%s/content.json" % (config.data_dir, address)):
s = time.time() s = time.time()
self.sites[address] = Site(address) self.sites[address] = Site(address)
logging.debug("Loaded site %s in %.3fs" % (address, time.time() - s)) self.log.debug("Loaded site %s in %.3fs" % (address, time.time() - s))
added += 1 added += 1
address_found.append(address) address_found.append(address)
@ -37,14 +40,14 @@ class SiteManager(object):
for address in self.sites.keys(): for address in self.sites.keys():
if address not in address_found: if address not in address_found:
del(self.sites[address]) del(self.sites[address])
logging.debug("Removed site: %s" % address) self.log.debug("Removed site: %s" % address)
if added: if added:
logging.debug("SiteManager added %s sites" % added) self.log.debug("SiteManager added %s sites" % added)
def save(self): def save(self):
if not self.sites: if not self.sites:
logging.error("Save error: No sites found") self.log.error("Save error: No sites found")
s = time.time() s = time.time()
data = json.load(open("%s/sites.json" % config.data_dir)) data = json.load(open("%s/sites.json" % config.data_dir))
for address, site in self.list().iteritems(): for address, site in self.list().iteritems():
@ -79,7 +82,7 @@ class SiteManager(object):
if not self.isAddress(address): if not self.isAddress(address):
return False # Not address: %s % address return False # Not address: %s % address
logging.debug("Added new site: %s" % address) self.log.debug("Added new site: %s" % address)
site = Site(address) site = Site(address)
self.sites[address] = site self.sites[address] = site
if not site.settings["serving"]: # Maybe it was deleted before if not site.settings["serving"]: # Maybe it was deleted before
@ -94,7 +97,7 @@ class SiteManager(object):
return site return site
def delete(self, address): def delete(self, address):
logging.debug("SiteManager deleted site: %s" % address) self.log.debug("SiteManager deleted site: %s" % address)
del(self.sites[address]) del(self.sites[address])
# Delete from sites.json # Delete from sites.json
sites_settings = json.load(open("%s/sites.json" % config.data_dir)) sites_settings = json.load(open("%s/sites.json" % config.data_dir))
@ -104,7 +107,7 @@ class SiteManager(object):
# Lazy load sites # Lazy load sites
def list(self): def list(self):
if self.sites is None: # Not loaded yet if self.sites is None: # Not loaded yet
logging.debug("Loading sites...") self.log.debug("Sites not loaded yet...")
self.load() self.load()
return self.sites return self.sites