[X2Go-Commits] [x2gobroker] 01/01: fix-up for eaa336c4012348f564de492309efa96eecb1c8bf
git-admin at x2go.org
git-admin at x2go.org
Fri Mar 27 14:00:20 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit f8acb9d28e2df5623d2cf451d79865372c5fcc43
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Mar 27 14:00:13 2015 +0100
fix-up for eaa336c4012348f564de492309efa96eecb1c8bf
---
x2gobroker/agent.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index eb6e888..92ed427 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -431,10 +431,10 @@ def checkload(remote_agent=None, logger=None, **kwargs):
p[key] = float(val)
load_factor = None
- if p['memAvail'] == 0:
- p['memAvail'] = p['myMemAvail']
-
try:
+ if p['memAvail'] == 0:
+ p['memAvail'] = p['myMemAvail']
+
load_factor = long( ( (p['memAvail']/1000) * p['numCPU'] * p['typeCPU'] * 100 ) / p['loadavgXX'] )
except KeyError:
pass
--
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