From d91798fb067b2388e8828c788890ccceface2c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Fri, 31 May 2013 22:43:28 +0200 Subject: [PATCH] [mac_prises] Oups. --- surveillance/mac_prises/mac_prise_analyzer.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/surveillance/mac_prises/mac_prise_analyzer.py b/surveillance/mac_prises/mac_prise_analyzer.py index d3d351be..21f932ec 100755 --- a/surveillance/mac_prises/mac_prise_analyzer.py +++ b/surveillance/mac_prises/mac_prise_analyzer.py @@ -122,8 +122,11 @@ def summary(): liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil'])) else: liste_triee[entry['mac']][entry['type']][chbres] = [] + liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil'])) else: liste_triee[entry['mac']][entry['type']] = {} + liste_triee[entry['mac']][entry['type']][chbres] = [] + liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil'])) for mac, ltype in liste_triee.items(): data = [] @@ -138,7 +141,10 @@ def summary(): data += [[dtype, ", ".join(list(chbres)), donnee[0], donnee[1], donnee[2]] for donnee in dataframe] output += u'Sur le relevé %s, la mac est apparue %s fois. Elle est apparue dans les chambres suivantes : %s.\n' % (dtype, number, ", ".join(list(chambres))) output += u'Consulter les logs (en PJ) pour plus d\'informations.\n\n' - maxlen = max([len(a[1]) for a in data]) + 4 + try: + maxlen = max([len(a[1]) for a in data]) + 4 + except ValueError: + maxlen = 4 titres = (u'relevé', u'chambres', u'date', u'rapport', u'seuil') alignements = ('c', 'c', 'c', 'c', 'c') largeurs = (12, maxlen, 20, 10, 10) @@ -215,6 +221,9 @@ if __name__ == '__main__': Logs = Logs.encode('UTF-8') output = output.encode('UTF-8') + if "--debug" in sys.argv or "debug" in sys.argv: + print output + sys.exit(0) message = """From: %(from)s To: %(to)s Subject: Résumé quotidien : mac_prises.