-def connect(sock,where="ici"):
- port=client_config.port
- ip={"ici":"localhost","vent":"vent.crans.org","eva":"eva.crans.org"}[where]
+class DeadServer(Exception):
+ pass
+
+def full_read(sock):
+ """Lit sur la socket jusqu'à ce que l'output soit déJSON-izable"""
+ output=""
+ i = 0
+ while True:
+ output+=sock.read()
+ i += 1
+ try:
+ return json.loads(output)
+ except:
+ pass
+ if i==10 and output=="":
+ raise DeadServer
+
+def connect(sock,where,port=None):
+ if port==None:
+ port=client_config.port
+ try:
+ ip={"ici":"localhost","vent":"vent.crans.org","eva":"eva.crans.org","cerebro":"cerebro.crans.org"}[where]
+ except:
+ ip=where