[X2Go-Commits] [x2goserver] 05/07: x2goserver/sbin/x2gocleansessions: also delete entries in the other, overlooked hashes.
git-admin at x2go.org
git-admin at x2go.org
Tue Jun 23 01:05:45 CEST 2015
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 6203e204a4756d92df03f3e36f8aacd61d6a4a69
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.
---
debian/changelog | 2 ++
x2goserver/sbin/x2gocleansessions | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ab2516a..cfc8788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,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 4718ac0..6a19c10 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -224,7 +224,11 @@ elsif ($pid == 0 )
# send SIGKILL to dangling X-server processes
syslog('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
More information about the x2go-commits
mailing list