[X2Go-Commits] [x2gobroker] 04/06: Report to log what the broker agent replied to us.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit e78ef5ec8bd2b34e9b6b9dd0c5715d3852d76f36
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 11 22:35:17 2014 +0200

    Report to log what the broker agent replied to us.
---
 debian/changelog    |    1 +
 x2gobroker/agent.py |    3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e7d18e7..4e79add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Make sure bind_address and bind_port are correctly detected from
       /etc/default/x2gobroker-daemon and /etc/x2go/broker/defaults.cfg.
     - Move split_host_address() code into x2gobroker.utils.
+    - Report to log what the broker agent replied to us.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 2b6a873..0a43633 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -134,6 +134,7 @@ def _call_local_broker_agent(username, task, cmdline_args=[]):
     except OSError:
         pass
 
+    logger_broker.info('Broker agent answered: {answer}'.format(answer="; ".join(result)))
     if result[0].startswith('OK'):
         return (True, [ r for r in result[1:] if r ])
 
@@ -196,6 +197,8 @@ def _call_remote_broker_agent(username, task, cmdline_args=[], remote_agent=None
             if err:
                 logger_broker.warning('Remote agent command (host: {remote_agent}) reported an error: {err}'.format(remote_agent=remote_agent['hostname'], err=err))
         client.close()
+        if result:
+            logger_broker.info('Broker agent answered: {answer}'.format(answer="; ".join(result)))
         if result and result[0].startswith('OK'):
             return (True, [ r for r in result[1:] if r ])
         else:

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git