[X2go-Commits] x2gobroker.git - tornado (branch) updated: 0.0.0.5-58-gf744b39

X2Go dev team git-admin at x2go.org
Tue Mar 5 22:36:08 CET 2013


The branch, tornado has been updated
       via  f744b3940f0b8cf705b9add326ed67703ee07243 (commit)
      from  ff5809f40d1735d77dc0f97936934c0f9927f433 (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 -----------------------------------------------------------------
commit f744b3940f0b8cf705b9add326ed67703ee07243
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 5 22:35:56 2013 +0100

    fixed delayed execution of agent.delete_authorize_key()

-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/agent.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 18980a6..4b14ce3 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -48,7 +48,6 @@ class delayed_execution(threading.Thread):
         while i < self.delay:
             time.sleep(1)
             i += 1
-            logger_broker.debug(i)
         self.agent_func(**self.kwargs)
 
 
@@ -228,7 +227,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=delay_deletion, 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, pubkey_hash=pubkey_hash, 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).




More information about the x2go-commits mailing list