[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.5-35-g3412130

X2Go dev team git-admin at x2go.org
Mon Mar 4 16:00:42 CET 2013


The branch, master has been updated
       via  341213001583b07248fad92073941705891eb53f (commit)
      from  d46aa2e207f31deda85dc0f896d53989cc244fe3 (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 341213001583b07248fad92073941705891eb53f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 4 16:00:36 2013 +0100

    add some debug logfile output

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

Summary of changes:
 x2gobroker/agent.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 1ea3373..4db16d7 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -51,6 +51,7 @@ def call_local_broker_agent(username, mode, cmdline_args=[]):
     for cmdline_arg in cmdline_args:
         cmd_line.append('"{arg}"'.format(arg=cmdline_arg))
 
+    logger_broker.debug('Executing agent command locally: {cmd}'.format(cmd=" ".join(cmd_line)))
     agent_process = subprocess.Popen(cmd_line,
                                      stdin=None,
                                      stdout=subprocess.PIPE,
@@ -100,9 +101,10 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
 
         result = []
         ssh_transport = client.get_transport()
-        if ssh_transport.is_authenticated():
+        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')
         client.close()
@@ -200,8 +202,15 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/
     @type remote_agent: C{dict}
 
     """
+    # this is for the logger output
+    if remote_agent is None:
+        _hostname = 'LOCAL'
+    else:
+        _hostname = remote_agent['hostname']
+
     if delay_deletion > 0:
         gevent.spawn_later(delay_deletion, delete_authorized_key, 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}: user={user}, host={host}'.format(delay_delay_deletion), user=username, host=_hostname)
     else:
         if query_mode.upper() == u'LOCAL':
             return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ])


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