From 12dd7abdc0e38383b2c20d484e3049d1435176ef Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Mon, 4 Jun 2012 15:57:29 -0500 Subject: DBStats: Stop loading ping data --- src/lib/Bcfg2/Server/Reports/importscript.py | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'src/lib/Bcfg2/Server/Reports') diff --git a/src/lib/Bcfg2/Server/Reports/importscript.py b/src/lib/Bcfg2/Server/Reports/importscript.py index 11603197b..ba300c28d 100755 --- a/src/lib/Bcfg2/Server/Reports/importscript.py +++ b/src/lib/Bcfg2/Server/Reports/importscript.py @@ -92,20 +92,12 @@ def load_stats(cdata, sdata, encoding, vlevel, logger, quick=False, location='') [clients.__setitem__(c.name, c) \ for c in Client.objects.all()] - pingability = {} - [pingability.__setitem__(n.get('name'), n.get('pingable', default='N')) \ - for n in cdata.findall('Client')] - for node in sdata.findall('Node'): name = node.get('name') c_inst, created = Client.objects.get_or_create(name=name) if vlevel > 0: logger.info("Client %s added to db" % name) clients[name] = c_inst - try: - pingability[name] - except KeyError: - pingability[name] = 'N' for statistics in node.findall('Statistics'): timestamp = datetime(*strptime(statistics.get('time'))[0:6]) ilist = Interaction.objects.filter(client=c_inst, @@ -191,24 +183,6 @@ def load_stats(cdata, sdata, encoding, vlevel, logger, quick=False, location='') mperfs.append(mperf) current_interaction.performance_items.add(*mperfs) - for key in list(pingability.keys()): - if key not in clients: - continue - try: - pmatch = Ping.objects.filter(client=clients[key]).order_by('-endtime')[0] - if pmatch.status == pingability[key]: - pmatch.endtime = datetime.now() - pmatch.save() - continue - except IndexError: - pass - Ping(client=clients[key], status=pingability[key], - starttime=datetime.now(), - endtime=datetime.now()).save() - - if vlevel > 1: - logger.info("---------------PINGDATA SYNCED---------------------") - #Clients are consistent if __name__ == '__main__': -- cgit v1.2.3-1-g7c22