From 53249f4f071da6864e538fe5361377ccde0a0546 Mon Sep 17 00:00:00 2001
From: ZeroNet <git@zeronet.io>
Date: Wed, 10 Aug 2016 12:32:28 +0200
Subject: [PATCH] Add own logger to SiteManager

---
 src/Site/SiteManager.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py
index 52df41aa..a60e6de4 100644
--- a/src/Site/SiteManager.py
+++ b/src/Site/SiteManager.py
@@ -14,11 +14,14 @@ from util import helper
 @PluginManager.acceptPlugins
 class SiteManager(object):
     def __init__(self):
+        self.log = logging.getLogger("SiteManager")
+        self.log.debug("Sitemanger created.")
         self.sites = None
         gevent.spawn(self.saveTimer)
 
     # Load all sites from data/sites.json
     def load(self):
+        self.log.debug("Loading sites...")
         from Site import Site
         if not 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)):
                 s = time.time()
                 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
             address_found.append(address)
 
@@ -37,14 +40,14 @@ class SiteManager(object):
         for address in self.sites.keys():
             if address not in address_found:
                 del(self.sites[address])
-                logging.debug("Removed site: %s" % address)
+                self.log.debug("Removed site: %s" % address)
 
         if added:
-            logging.debug("SiteManager added %s sites" % added)
+            self.log.debug("SiteManager added %s sites" % added)
 
     def save(self):
         if not self.sites:
-            logging.error("Save error: No sites found")
+            self.log.error("Save error: No sites found")
         s = time.time()
         data = json.load(open("%s/sites.json" % config.data_dir))
         for address, site in self.list().iteritems():
@@ -79,7 +82,7 @@ class SiteManager(object):
 
             if not self.isAddress(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)
             self.sites[address] = site
             if not site.settings["serving"]:  # Maybe it was deleted before
@@ -94,7 +97,7 @@ class SiteManager(object):
         return site
 
     def delete(self, address):
-        logging.debug("SiteManager deleted site: %s" % address)
+        self.log.debug("SiteManager deleted site: %s" % address)
         del(self.sites[address])
         # Delete from sites.json
         sites_settings = json.load(open("%s/sites.json" % config.data_dir))
@@ -104,7 +107,7 @@ class SiteManager(object):
     # Lazy load sites
     def list(self):
         if self.sites is None:  # Not loaded yet
-            logging.debug("Loading sites...")
+            self.log.debug("Sites not loaded yet...")
             self.load()
         return self.sites