This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit c3cacda65ad49a258478225ceca6d89e26ac2ded Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 26 21:41:26 2015 +0100 LoadChecker.loadchecker(): Use load checker daemon's logger instance for logging actions taken place in agent.py. --- debian/changelog | 2 ++ x2gobroker/loadchecker.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index baa97ea..08c7622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Pre-release pyflakes cleanup. - agent.py: Capture login failures in checkload() function. - agent.py: Allow providing a custom logger instance in all functions. + - LoadChecker.loadchecker(): Use load checker daemon's logger instance + for logging actions taken place in agent.py. * 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/loadchecker.py b/x2gobroker/loadchecker.py index f38717e..d21e776 100644 --- a/x2gobroker/loadchecker.py +++ b/x2gobroker/loadchecker.py @@ -175,7 +175,7 @@ class LoadChecker(threading.Thread): self.server_load[backend][profile_id] = {} remote_agents = self.brokers[backend].get_all_remote_agents(profile_id) for remote_agent in remote_agents: - self.server_load[backend][profile_id][remote_agent[u'hostname']] = x2gobroker.agent.checkload(remote_agent) + self.server_load[backend][profile_id][remote_agent[u'hostname']] = x2gobroker.agent.checkload(remote_agent, logger=self.logger) if self.logger: self.logger.info('LoadChecker.loadchecker(): contacted remote broker agent for backend={backend}, profile_id={profile_id}, hostname={hostname}, new load factor is: {lf}'.format(backend=backend, profile_id=profile_id, hostname=remote_agent[u'hostname'], lf=self.server_load[backend][profile_id][remote_agent[u'hostname']])) num_queries += 1 if time_to_sleep > 0: -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git