Fixed collectables error: list hash and scheduler

config/client.conf

 [Client]
 [Client]
-Debug = True
+Debug = False
 
 
 [Metrics]
 [Metrics]
-cpuUsage = True
-memoryUsage = True
-userCount = True
-swapUsage = True
-systemBootTime = True
-packageTraffic = True
-dataTraffic = True
+cpuUsage = 5
+memoryUsage = 5
+userCount = 60
+swapUsage = 30
+systemBootTime = 120
+packageTraffic = 10
+dataTraffic = 10

src/client.py

@@ -60,7 +60,7 @@ class Client:
         """
         """
         Send the message given in the parameters.
         Send the message given in the parameters.
         """
         """
-        self.channel.basic_publish(exchange=self. amqp_queue,
+        self.channel.basic_publish(exchange=self.amqp_queue,
                                    routing_key='', body="\n".join(message))
                                    routing_key='', body="\n".join(message))
 
 
     def __collectFromNode(self, metricCollectors):
     def __collectFromNode(self, metricCollectors):
@@ -96,9 +96,9 @@ class Client:
                   % (self.server_address + ":" + str(self.server_port)))
                   % (self.server_address + ":" + str(self.server_port)))
         else:
         else:
             print("Connection established to %s on port %s. \
             print("Connection established to %s on port %s. \
-                  Report frequency is %d sec. Clientname: %s"
+                  Clientname: %s"
                   % (self.server_address, self.server_port,
                   % (self.server_address, self.server_port,
-                     self.delay, self.name))
+                     self.name))
         try:
         try:
             maxFrequency = self.getMaxFrequency(metricCollectors)
             maxFrequency = self.getMaxFrequency(metricCollectors)
             while True:
             while True:

src/cnfparse.py

@@ -21,7 +21,7 @@ def importConf(path_to_file):
     except configparser.ParsingError:
     except configparser.ParsingError:
         print("Config file contains error! Reason: Cannot parse.")
         print("Config file contains error! Reason: Cannot parse.")
         raise
         raise
-    except configparser.MissingSectionHeader:
+    except configparser.MissingSectionHeaderError:
         print("Config file contains error! Reason: Missing section-header.")
         print("Config file contains error! Reason: Missing section-header.")
         raise
         raise
 
 

src/collectables.py

@@ -32,15 +32,15 @@ class collectables:
     @staticmethod
     @staticmethod
     def provide(requests=[]):
     def provide(requests=[]):
         #valid_keys = collectables.listKeys()
         #valid_keys = collectables.listKeys()
-        reqs = [request for request, value in requests.items()
-                if value > 0]
+        reqs = []
+	for requests, value in requests.items():
+		if value>0:
+			reqs.append([requests, value])
         collectors = []
         collectors = []
         for request in reqs:
         for request in reqs:
-            for item in collectables.__collectables[request]:
-                collectors.append([item.harvest, value])
-        seen = set()
-        seen_add = seen.add
-        return [x for x in collectors if x not in seen and not seen_add(x)]
+            for item in collectables.__collectables[request[0]]:
+                collectors.append([item.harvest, request[1]])
+	return collectors
 
 
     @staticmethod
     @staticmethod
     def provideAll():
     def provideAll():