[X2Go-Commits] [x2goserver] 05/07: x2goserver/sbin/x2gocleansessions: also delete entries in the other, overlooked hashes.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 45a92c73c6e675a1a7e963f7b3398beff1fb4f81
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jun 23 00:02:47 2015 +0200

    x2goserver/sbin/x2gocleansessions: also delete entries in the other, overlooked hashes.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog                  |    2 ++
 x2goserver/sbin/x2gocleansessions |    4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2eb4e3e..7cf1ff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -212,6 +212,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
     - x2goserver/sbin/x2gocleansessions: unify log messages. Move dangling
       line around.
     - x2goserver/sbin/x2gocleansessions: whitespace only.
+    - x2goserver/sbin/x2gocleansessions: also delete entries in the other,
+      overlooked hashes.
   * 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 de96487..d6a003b 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -217,7 +217,11 @@ elsif ($pid == 0 )
 					# send SIGKILL to dangling X-server processes
 					log_message('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL");
 					system("kill", "-9", "@sinfo[0]");
+
+					# Remove all references to this sessions. We will never see it again.
+					delete $remembered_sessions_status{@sinfo[1]};
 					delete $remembered_sessions_status_since_time{@sinfo[1]};
+					delete $remembered_sessions_status_since_iterations{@sinfo[1]};
 				}
 				my $display = @sinfo[2];
 				if (-S "/tmp/.X11-unix/X$display") {

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git