[X2Go-Commits] [x2gobroker] 01/01: LoadCheckerServiceHandler(): Add line breaks in per-profile output. Return nothing if the load checker service is unreachable.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 30 05:41:58 CEST 2015


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 2ab71c5ec280653ffba48d76ac8528418d8c0925
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 30 05:41:53 2015 +0200

    LoadCheckerServiceHandler(): Add line breaks in per-profile output. Return nothing if the load checker service is unreachable.
---
 debian/changelog            |    2 ++
 sbin/x2gobroker-loadchecker |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7d8539..2c82fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -258,6 +258,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       QEMU hosts).
     - LoadChecker.loadchecker(): Report about query failures, as well, in query
       cycle summary.
+    - LoadCheckerServiceHandler(): Add line breaks in per-profile output. Return
+      nothing if the load checker service is unreachable.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/sbin/x2gobroker-loadchecker b/sbin/x2gobroker-loadchecker
index 8d6ae32..0243dca 100755
--- a/sbin/x2gobroker-loadchecker
+++ b/sbin/x2gobroker-loadchecker
@@ -89,13 +89,12 @@ class LoadCheckerServiceHandler(asyncore.dispatcher_with_send):
                 if load_factors:
                     for h in load_factors.keys():
                         if load_factors[h] is not None:
-                            output +="{hostname}:{loadfactor}".format(hostname=h, loadfactor=load_factors[h])
+                            output +="{hostname}:{loadfactor}\n".format(hostname=h, loadfactor=load_factors[h])
                             if self.logger: self.logger.info('LoadCheckServiceHandler.handle_read(): load check result for backend={backend}, profile_id={profile_id}, hostname={hostname}: {lf}'.format(backend=backend, profile_id=profile_id, hostname=h, lf=load_factors[h]))
                         else:
-                            output += "{hostname}:LOAD-UNAVAILABLE".formate(hostname=h)
+                            output += "{hostname}:LOAD-UNAVAILABLE\n".format(hostname=h)
                             if self.logger: self.logger.warning('LoadCheckServiceHandler.handle_read(): load check failure for backend={backend}, profile_id={profile_id}, hostname={hostname}: LOAD-UNAVAILABLE'.format(backend=backend, profile_id=profile_id, hostname=h))
                 else:
-                    output += "LOAD-UNAVAILABLE"
                     if self.logger: self.logger.warning('LoadCheckServiceHandler.handle_read(): load check failure for backend={backend}, profile_id={profile_id}: LOAD-UNAVAILABLE'.format(backend=backend, profile_id=profile_id))
             self.send(output)
 

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


More information about the x2go-commits mailing list