[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.0.2-11-g2bb0600

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:18:33 CET 2013


The branch, build-main has been updated
       via  2bb06001886a03aa6da1325fbea680bbe6adb33b (commit)
      from  709571203da179ba6e4a46f9b68d9c354dfdc8d2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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 4b9f637..31caa39 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -140,7 +140,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) {
@@ -148,6 +148,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