diff --git a/client.py b/client.py index 859a31993c54a564624a2611521f708efe07c945..efe301528c8549d0e35ad856062ec82000965cf5 100755 --- a/client.py +++ b/client.py @@ -259,8 +259,8 @@ class simple_memoize(object): mais il faudra s'en préoccuper si un jour on veut changer le comportement.""" if self.val == None: self.val = self.f(*args, **kwargs) - # On évite de tout deepcopier. Typiquement, un subprocess.Popen - # ne devrait pas l'être (comme dans get_keep_alive_connection) + # On évite de tout deepcopier. Typiquement, un SSHClient + # ne devrait pas l'être (comme dans create_ssh_client) if type(self.val) in [dict, list]: return copy.deepcopy(self.val) else: diff --git a/clientconfig.example.py b/clientconfig.example.py index 13ba00053a782bc583af417fc4edb1086f96fdee..78b061f9a420f6016e35c245e1cd024ddd0099cf 100755 --- a/clientconfig.example.py +++ b/clientconfig.example.py @@ -31,7 +31,6 @@ servers = { 'localhost': { 'host': 'localhost', 'remote_cmd': distant_cmd, - 'keep-alive': True, # <-- experimental, n'ouvre qu'une connexion }, 'ovh': { 'host': 'soyouz.crans.org', diff --git a/clientconfigs/crans/clientconfig.py b/clientconfigs/crans/clientconfig.py index 2ccc13131b2de46fda1b09b59c1a8a4a95a86af6..1e228268372f07f44e5d5315ac6e942d4dcbcbf1 100644 --- a/clientconfigs/crans/clientconfig.py +++ b/clientconfigs/crans/clientconfig.py @@ -34,7 +34,6 @@ servers = { 'localhost': { 'host': 'localhost', 'remote_cmd': distant_cmd, - 'keep-alive': True, # <-- experimental, n'ouvre qu'une connexion }, 'ovh': { 'host': 'soyouz.crans.org', diff --git a/clientconfigs/tudor/clientconfig.py b/clientconfigs/tudor/clientconfig.py index 99826944d0625816ec4240d01c58445e131aea3a..3f3e6886d40a2367c17c7c65b7aa07eeb3e1dbf1 100644 --- a/clientconfigs/tudor/clientconfig.py +++ b/clientconfigs/tudor/clientconfig.py @@ -15,21 +15,17 @@ servers = { 'default': { 'host': '', 'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ], - 'keep-alive': True, }, 'gladys': { 'host': 'home.b2moo.fr', 'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ], - 'keep-alive': True, }, 'gladys-home': { 'host': 'gladys.home', 'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ], - 'keep-alive': True, }, 'pimeys': { 'host': 'pimeys.fr', 'remote_cmd': ['sudo', '-n', '/usr/local/bin/cranspasswords-server', ], - 'keep-alive': True, }, }