small bugfixes in members and tasks parsing

linspector/config/hostgroups.py

@@ -36,24 +36,24 @@ class HostGroupMissingArgumentException(HostGroupException):
 
 
 class HostGroup(object):
-    def __init__(self, name, **kwargs):
+    def __init__(self, _name, **kwargs):
-        self.name = name
+        self.name = _name
         tmp = "members"
         self.members = []
         if not tmp in kwargs:
-            raise HostGroupMissingArgumentException(tmp, name)
+            raise HostGroupMissingArgumentException(tmp, _name)
         self.add_members(kwargs[tmp])
         
         tmp = "hosts"
         self.hosts = []
         if not tmp in kwargs:
-            raise HostGroupMissingArgumentException(tmp, name)
+            raise HostGroupMissingArgumentException(tmp, _name)
         self.add_hosts(kwargs[tmp])
         
         tmp = "services"
         self.__services = []
         if not tmp in kwargs:
-            raise HostGroupMissingArgumentException(tmp, name)
+            raise HostGroupMissingArgumentException(tmp, _name)
         self.add_services(kwargs[tmp])
         
         self.parents = []

linspector/config/members.py

@@ -36,12 +36,12 @@ class MemberMissingArgumentException(MemberException):
 
 
 class Member:
-    def __init__(self, name="", **kwargs):
+    def __init__(self, _name, **kwargs):
-        self.name = name
+        self.name = _name
         tmp = "tasks"
-        self.tasks = []
+        self.__tasks = []
         if not tmp in kwargs:
-            raise MemberMissingArgumentException(tmp, name)
+            raise MemberMissingArgumentException(tmp, _name)
         self.add_tasks(kwargs[tmp])
 
     def __add_internal(self, l, item):
@@ -50,6 +50,9 @@ class Member:
         else:
             l.append(item)
 
+    def get_name(self):
+        return self.name
+
     def add_tasks(self, tasks):
         self.__add_internal(self.get_tasks(), tasks)
     

linspector/config/parser.py

@@ -114,9 +114,9 @@ class ConfigParser:
             try:
                 item = creator(key, val)
                 items.append(item)
-            except Exception:
+            except Exception, e:
                 logger.warning("ignoring " + msgName + ": " + key + "! reason:")
-                logger.warning(str(Exception))
+                logger.warning(str(e))
         return items
 
     def _load_module(self, clazz, modPart):

linspector/tasks/task.py

@@ -28,7 +28,7 @@ KEY_ARGS = "args"
 logger = getLogger(__name__)
 
 
-class Task:
+class Task(object):
     def __init__(self, **kwargs):
 
         self._args = {}