This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 0d57179 debian/changelog: wrap-2-more-lines... new ecf1912 debian/changelog: Fix bug closure for #1252. new e46b65a lib/x2gobroker-agent.pl: Make sure that the reported system load average is never zero. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 +- etc/x2gobroker.conf | 3 ++- lib/x2gobroker-agent.pl | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit ecf1912bb435f5b23a7ffcd3bed6542e3b04a239 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 15 17:43:15 2018 +0200 debian/changelog: Fix bug closure for #1252. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 13ac1e7..0dad151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,7 +49,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium - x2gobroker/loadchecker.py: Report properly to the logger if we fail to obtain a load factor. - x2gobroker-loadchecker.service: loadchecker service needs to chuid to - system user x2gobroker. (Closes: #1252). + system user x2gobroker. (Fixes: #1252). - x2gobroker-loadchecker.service: File ownership should be x2gobroker:x2gobroker, too. - x2gobroker-loadchecker: No chown/chmod if we are not running as root -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit e46b65aedef296804c9bc5ce2cecac494dfbdb31 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jun 15 21:53:58 2018 +0200 lib/x2gobroker-agent.pl: Make sure that the reported system load average is never zero. --- etc/x2gobroker.conf | 3 ++- lib/x2gobroker-agent.pl | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index dc35007..23fe594 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -274,7 +274,8 @@ # load-factor = -------------------------------------- # loadavg*100 * numSessions # -# (memAvail in MByte, typeCPUs in MHz) +# (memAvail in MByte, typeCPUs in MHz, loadavg is (system load *100 + 1) as +# positive integer value) # # The higher the load-factor, the more likely that a server will be chosen # for the next to be allocated X2Go session. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 708ceca..18d6492 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -160,9 +160,9 @@ if ( $mode eq 'checkload' ) { open FILE, "< /proc/loadavg" or die return ("Cannot open /proc/loadavg: $!"); my ($avg1, $avg5, $avg15, undef, undef) = split / /, <FILE>; close FILE; - my $loadavgXX = ( $avg1 + $avg5 + $avg15 ) * 100/3; - if ( $loadavgXX == 0 ) { - # load may not be ZERO + my $loadavgXX = ( $avg1 + $avg5 + $avg15 ) * 100/3 + 1; + if ( $loadavgXX lt 1 ) { + # load may not be ZERO, we should never get here... $loadavgXX = 1; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org