[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-48-g84eb4bb

X2Go dev team git-admin at x2go.org
Wed Oct 2 15:56:33 CEST 2013


The branch, master has been updated
       via  84eb4bbf57ac2221c05a1c8284c7490e9231ad81 (commit)
      from  96a80ded18ff40b118ea265a59f61239010f823b (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 84eb4bbf57ac2221c05a1c8284c7490e9231ad81
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 2 15:56:23 2013 +0200

    Report stderr results to the broker log channel (broker.log). This allows debugging of X2Go Session Broker Agent via the X2Go Session Broker logging instance. (Fixes: #217).

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

Summary of changes:
 debian/changelog    |    3 +++
 x2gobroker/agent.py |    3 +++
 2 files changed, 6 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7cb7c77..1e9ddfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - Catch RequestHandler errors and write them to the error log channel.
     - Raised verbosity level to INFO for session broker utilities.
     - Add sanity checks to x2gobroker-pubkeyauthorizer.
+    - Report stderr results to the broker log channel (broker.log). This
+      allows debugging of X2Go Session Broker Agent via the X2Go Session
+      Broker logging instance. (Fixes: #217).
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
   * /debian/x2gobroker-agent.dirs:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index be7b0e5..a334382 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -156,6 +156,9 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
             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')
+            err = stderr.read().replace('\n', ' ')
+            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 and result[0].startswith('OK'):
             return [ r for r in result[1:] if r ]


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