[X2Go-Commits] [x2gobroker] 02/02: x2gobroker-agent: fix interpretation of findbusyservers output

git-admin at x2go.org git-admin at x2go.org
Wed Mar 19 10:39:13 CET 2014


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit cd7b19e407eee81a838ed2686492c6d73af5fac2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 19 10:39:00 2014 +0100

    x2gobroker-agent: fix interpretation of findbusyservers output
---
 sbin/x2gobroker-testagent |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent
index ade4403..3d6b825 100755
--- a/sbin/x2gobroker-testagent
+++ b/sbin/x2gobroker-testagent
@@ -195,12 +195,12 @@ if __name__ == "__main__":
         print
     elif task.startswith('findbusyservers') and type(result) is types.DictType:
         if result:
-            print "\n".join(result.items())
+            print "\n".join([ "{host} -- {usage}%".format(host=host, usage=usage) for host, usage in result.items() ])
         else:
             print "X2Go Server busy state: All servers are idle."
-            print
             # even an empty dict means, that we have been successful...
             result = True
+        print
 
     if task == 'addauthkey' and result:
         on_host = " on {host}".format(host=cmdline_args.host) if cmdline_args.host != 'LOCAL' else ""

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



More information about the x2go-commits mailing list