Merge remote-tracking branch 'origin/new-design'

[ipfire.org.git] / src / backend / base.py

diff --git a/src/backend/base.py b/src/backend/base.py
index 40e1c7a5a39933f9c1ddfb576432586bb6c3bf1b..7e86251aa86553c63a43cf7511bede17af930635 100644 (file)
--- a/src/backend/base.py
+++ b/src/backend/base.py
@@ -9,14 +9,16 @@ import tornado.httpclient
 
 from . import accounts
 from . import asterisk
+from . import analytics
 from . import blog
 from . import bugzilla
+from . import cache
 from . import campaigns
 from . import database
 from . import fireinfo
 from . import httpclient
 from . import iuse
-from . import memcached
+from . import lists
 from . import messages
 from . import mirrors
 from . import netboot
@@ -56,13 +58,15 @@ class Backend(object):
                # Create HTTPClient
                self.http_client = httpclient.HTTPClient(self)
 
-               # Initialize settings first.
+               # Initialize the cache
+               self.cache = cache.Cache(self)
+
+               # Initialize settings first
                self.settings = settings.Settings(self)
-               self.memcache = memcached.Memcached(self)
 
                # Initialize backend modules.
                self.accounts = accounts.Accounts(self)
-               self.asterisk = asterisk.Asterisk(self)
+               self.analytics = analytics.Analytics(self)
                self.bugzilla = bugzilla.Bugzilla(self)
                self.fireinfo = fireinfo.Fireinfo(self)
                self.iuse = iuse.IUse(self)
@@ -163,6 +167,10 @@ class Backend(object):
                if r:
                        raise SystemExit(r)
 
+       @lazy_property
+       def asterisk(self):
+               return asterisk.Asterisk(self)
+
        @lazy_property
        def campaigns(self):
                return campaigns.Campaigns(self)
@@ -171,6 +179,10 @@ class Backend(object):
        def groups(self):
                return accounts.Groups(self)
 
+       @lazy_property
+       def lists(self):
+               return lists.Lists(self)
+
        @lazy_property
        def messages(self):
                return messages.Messages(self)