From df4d564ffb189831ed7e310237a2f647f0f5d8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Sun, 25 Oct 2015 22:06:41 +0100 Subject: [PATCH] =?UTF-8?q?host=5Fexists=20ne=20marchait=20pas,=20le=20pat?= =?UTF-8?q?ch=20pour=20batb-5=20avait=20coup=C3=A9=20mac=5Fprises?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- surveillance/mac_prises/mac_prise.py | 3 ++- surveillance/mac_prises/mac_prise_holder.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/surveillance/mac_prises/mac_prise.py b/surveillance/mac_prises/mac_prise.py index 962b0108..00a88405 100755 --- a/surveillance/mac_prises/mac_prise.py +++ b/surveillance/mac_prises/mac_prise.py @@ -30,6 +30,7 @@ def host_exists(hostname): socket.gethostbyname(hostname) except socket.gaierror: return False + return True def liste_chambres_macs(switch, annuaire): u''' @@ -40,7 +41,7 @@ def liste_chambres_macs(switch, annuaire): ''' liste_bats = ['a', 'b', 'c', 'g', 'h', 'i', 'j', 'm', 'p'] - split = switch.replace('.adm.crans.org', '').split('-') + split = switch.split(".")[0].split('-') bat, num_switch = split[0][-1], int(split[1][0]) if bat not in liste_bats: return {} diff --git a/surveillance/mac_prises/mac_prise_holder.py b/surveillance/mac_prises/mac_prise_holder.py index ce9b56c3..d84cba8e 100755 --- a/surveillance/mac_prises/mac_prise_holder.py +++ b/surveillance/mac_prises/mac_prise_holder.py @@ -76,7 +76,7 @@ if __name__ == '__main__': # parallélise vraiment ! for switch in switches: output[switch] = threads[switch].output() - + curseur = get_curseur(time.time()) requete = "INSERT INTO correspondance (date, chambre, mac) VALUES (%s, %s, %s);"