Migrate to libloc

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

diff --git a/src/backend/base.py b/src/backend/base.py
index 0fdf2c436b219f53d465587eb1660eea309ae61c..6ee041dc212ada18f9e608df2b58783a2cdf84bf 100644 (file)
--- a/src/backend/base.py
+++ b/src/backend/base.py
@@ -8,7 +8,6 @@ from . import accounts
 from . import blog
 from . import campaigns
 from . import database
-from . import geoip
 from . import fireinfo
 from . import iuse
 from . import memcached
@@ -18,9 +17,11 @@ from . import netboot
 from . import nopaste
 from . import ratelimit
 from . import releases
+from . import resolver
 from . import settings
 from . import talk
 from . import tweets
+from . import util
 from . import wiki
 from . import zeiterfassung
 from .decorators import *
@@ -57,7 +58,6 @@ class Backend(object):
 
                # Initialize backend modules.
                self.accounts = accounts.Accounts(self)
-               self.geoip = geoip.GeoIP(self)
                self.fireinfo = fireinfo.Fireinfo(self)
                self.iuse = iuse.IUse(self)
                self.mirrors = mirrors.Mirrors(self)
@@ -106,7 +106,6 @@ class Backend(object):
                        "scan-files"          : self.releases.scan_files,
                        "send-message"        : self.messages.send_cli,
                        "send-all-messages"   : self.messages.queue.send_all,
-                       "test-blacklist"      : self.geoip.test_blacklist,
                        "test-ldap"           : self.accounts.test_ldap,
                        "tweet"               : self.tweets.tweet,
                        "update-blog-feeds"   : self.blog.update_feeds,
@@ -141,6 +140,10 @@ class Backend(object):
        def ratelimiter(self):
                return ratelimit.RateLimiter(self)
 
+       @lazy_property
+       def resolver(self):
+               return resolver.Resolver(tries=2, timeout=2, domains=[])
+
        @lazy_property
        def tweets(self):
                return tweets.Tweets(self)