Merge branch 'master' of ssh://git.f-lab.fr/git/sfa

[sfa.git] / sfa / server / interface.py

diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index baeb2e7..dbc8ef2 100644 (file)
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -64,13 +64,13 @@ class Interfaces(dict):
         # load config file
         self.interface_info = XmlStorage(conf_file, self.default_dict)
         self.interface_info.load()
-        records = self.interface_info.values()[0].values()[0]
+        records = self.interface_info.values()[0]
         if not isinstance(records, list):
             records = [records]
         
         required_fields = self.default_fields.keys()
         for record in records:
-            if not set(required_fields).issubset(record.keys()):
+            if not record or not set(required_fields).issubset(record.keys()):
                 continue
             # port is appended onto the domain, before the path. Should look like:
             # http://domain:port/path