The branch, build-main has been updated via ff5809f40d1735d77dc0f97936934c0f9927f433 (commit) from 30c5d7913cd73b6172673983ee37160f3a5c9f71 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index b32489a..18980a6 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -44,7 +44,11 @@ class delayed_execution(threading.Thread): self.start() def run(self): - time.sleep(self.delay) + i = 0 + while i < self.delay: + time.sleep(1) + i += 1 + logger_broker.debug(i) self.agent_func(**self.kwargs) @@ -119,7 +123,6 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) ssh_transport = client.get_transport() if ssh_transport and ssh_transport.is_authenticated(): cmd = ' '.join(cmd_line) - cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd) logger_broker.debug('Executing agent command on remote host ({remote_agent}): {cmd}'.format(remote_agent=remote_agent['hostname'], cmd=cmd)) (stdin, stdout, stderr) = client.exec_command(cmd) result = stdout.read().split('\n') @@ -225,7 +228,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ _hostname = remote_agent['hostname'] if delay_deletion > 0: - delayed_execution(delete_authorized_key, delay=60, username=username, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, ) + delayed_execution(delete_authorized_key, delay=delay_deletion, username=username, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, ) logger_broker.debug('Scheduled deletion of authorized key in {delay}s: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname)) else: if query_mode.upper() == u'LOCAL': hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).