web: Rename base module

[ipfire.org.git] / src / web / location.py

diff --git a/src/web/location.py b/src/web/location.py
index a9e5dc17ab68c1c1e3c9ff20acb8313943424246..977a59f07394b7e2f3ef252fcda682a84acb9c84 100644 (file)
--- a/src/web/location.py
+++ b/src/web/location.py
@@ -1,9 +1,11 @@
 
 #!/usr/bin/python
 
+import logging
+import tornado.gen
 import tornado.web
 
-from . import handlers_base as base
+from . import base
 
 class IndexHandler(base.BaseHandler):
        def get(self):
@@ -11,9 +13,17 @@ class IndexHandler(base.BaseHandler):
 
 
 class LookupHandler(base.BaseHandler):
+       @tornado.gen.coroutine
        def get(self, address):
                peer = self.geoip.get_all(address)
                if peer:
                        peer["country_name"] = self.geoip.get_country_name(peer.country)
 
-               self.render("location/lookup.html", address=address, peer=peer)
+               # Lookup address
+               address = self.geoip.lookup(address)
+
+               # Lookup blacklists
+               blacklists = yield address.get_blacklists()
+
+               self.render("location/lookup.html",
+                       address=address, blacklists=blacklists, peer=peer)