[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-170-g7aa3976

X2Go dev team git-admin at x2go.org
Thu Jun 6 01:56:55 CEST 2013


The branch, master has been updated
       via  7aa3976cc3a0e357aa12939ac39f14fd534194a9 (commit)
      from  55039d87e27f13db56e1b0ff6afc75a0ce1031a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7aa3976cc3a0e357aa12939ac39f14fd534194a9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 6 01:56:35 2013 +0200

    another follow-up fix

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/sbin/x2gocleansessions |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 1b3eb13..58a1d91 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -138,7 +138,7 @@ elsif ($pid == 0 )
 			{
 
 				syslog('debug', "@sinfo[1] is blocked");
-				if defined $hash{ $key }
+				if (defined $blocked_sessions{ @sinfo[1] }
 				{
 					$blocked_sessions{@sinfo[1]} += 2;
 					if ($blocked_sessions{@sinfo[1]} >= 20) {
@@ -146,6 +146,7 @@ elsif ($pid == 0 )
 						# send SIGKILL to dangling X-server processes
 						syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL");
 						qw(kill -9 @sinfo[0]);
+						delete $blocked_sessions{$session};
 					}
 				} else {
 					$blocked_sessions{@sinfo[1]} = 0;


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).




More information about the x2go-commits mailing list