[X2Go-Commits] [x2goserver] 02/02: Make sure that incompletely started up sessions get wiped from the session DB after 10 seconds.
git-admin at x2go.org
git-admin at x2go.org
Fri Oct 3 12:38:43 CEST 2014
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 e11f565d83c1a42e0ce14bf541207745e848a29f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Oct 3 12:38:20 2014 +0200
Make sure that incompletely started up sessions get wiped from the session DB after 10 seconds.
---
debian/changelog | 2 ++
x2goserver/sbin/x2gocleansessions | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cf332b4..67deb50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goserver (4.0.1.17-0x2go1) UNRELEASED; urgency=medium
sessions are still in running / suspended state. (Fixes: #623).
- Handle stale X11 socket files in cases where x2goagent has
mysteriously disappeared (e.g. kill -9). (Fixes: #626).
+ - Make sure that incompletely started up sessions get wiped from the
+ session DB after 10 seconds.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 02 Oct 2014 12:18:58 +0200
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 62f4be7..b3b5f5a 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -174,6 +174,13 @@ elsif ($pid == 0 )
my @sinfo=split('\\|',"@outp[$i]");
+ # clean up invalid sessions from the session database
+ if ( ( ! @sinfo[0] ) && ( $remembered_sessions_since{ @sinfo[1] } ge 10 ) )
+ {
+ dbsys_rmsessionsroot(@sinfo[1]);
+ next;
+ }
+
if (defined $remembered_sessions_since{ @sinfo[1] } && ($remembered_sessions_status{ @sinfo[1] } =~m/@sinfo[4]/ ))
{
$remembered_sessions_since{ @sinfo[1] } += 2;
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list