Allow the plugins to return the results as a tuple or list

[collecty.git] / src / collecty / plugins / conntrack.py

diff --git a/src/collecty/plugins/conntrack.py b/src/collecty/plugins/conntrack.py
index cbfece99c3526af35dffce0c9ea0d8252d2667d0..0e1c6d9009c72fff278cd410325cb66ccaa73f4e 100644 (file)
--- a/src/collecty/plugins/conntrack.py
+++ b/src/collecty/plugins/conntrack.py
@@ -414,7 +414,7 @@ class ConntrackLayer3ProtocolsObject(ConntrackObject):
                        r = self.conntrack_table.layer3_protocols.get(proto, 0)
                        results.append("%s" % r)
 
-               return ":".join(results)
+               return results
 
 
 class ConntrackLayer4ProtocolsObject(ConntrackObject):
@@ -435,7 +435,7 @@ class ConntrackLayer4ProtocolsObject(ConntrackObject):
                        r = self.conntrack_table.layer4_protocols.get(proto, 0)
                        results.append("%s" % r)
 
-               return ":".join(results)
+               return results
 
 
 class ConntrackProtocolWithStatesObject(ConntrackObject):
@@ -464,7 +464,7 @@ class ConntrackProtocolWithStatesObject(ConntrackObject):
                return results
 
        def collect(self):
-               return ":".join(self.get_states())
+               return self.get_states()
 
 
 class ConntrackPlugin(base.Plugin):