This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 08ab5c8b404690062a34f353a3294677e931ff75 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 21 22:39:05 2015 +0200 x2goserver/sbin/x2gocleansessions: re-fetch the current sessions' status before handling it. Using the "cached" value from the initial x2golistsessions run may be desynchronized with the actual current value. Avoids a race condition logging users out after they attached to a session. --- debian/changelog | 5 +++++ x2goserver/sbin/x2gocleansessions | 3 +++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 183075e..1e6dc72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low file. Only check the primary and secondary groups as returned by getgid()/getgroups(). Fixes long delays in session startup on machines with a gazillion of groups. + - x2goserver/sbin/x2gocleansessions: re-fetch the current sessions' status + before handling it. Using the "cached" value from the initial + x2golistsessions run may be desynchronized with the actual current + value. Avoids a race condition logging users out after they attached to a + session. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 897ed88..ef6c463 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -197,6 +197,9 @@ elsif ($pid == 0 ) #print @sinfo[1], ': ', $remembered_sessions_since{@sinfo[1]},' ',$remembered_sessions_status{@sinfo[1]},"\n"; + # Update current status once per session. Avoids race conditions. + @sinfo[4] = system_capture_stdout_output ("$x2go_lib_path/x2gogetstatus", "@sinfo[1]"); + if (@sinfo[4]eq 'F') { syslog('debug', "@sinfo[1] is blocked"); -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git