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 a828f15d920eb3401cfff6be4832ada4f89dd437 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jun 23 15:40:17 2015 +0200 x2goserver/sbin/x2gocleansessions: don't add failed/finished sessions to remembered list if that list already includes them. --- debian/changelog | 2 ++ x2goserver/sbin/x2gocleansessions | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d6914c..b8bcf5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low array. Merge with session list as queried from the database (won't include finished/failed sessions) and remember F-state sessions via this array. Only delete elements once work on these has been finished. + - x2goserver/sbin/x2gocleansessions: don't add failed/finished sessions to + remembered list if that list already includes them. * 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 73c04d4..c4da48c 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -218,8 +218,12 @@ elsif ($pid == 0 ) if (@sinfo[4] eq 'F') { - syslog ('debug', "@sinfo[1]: is blocked, adding to finished list."); - push (@remembered_finished_sessions, join ('|', @sinfo)); + syslog ('debug', "@sinfo[1]: is blocked."); + # Only add to finished list if it isn't in there already. + if (!(grep { ((defined ($_)) && ($_ =~ m/\Q@sinfo[1]\E/)) } @remembered_finished_sessions)) { + syslog ('debug', "@sinfo[1]: adding to finished list."); + push (@remembered_finished_sessions, join ('|', @sinfo)); + } # Kill the process if blocked for more than 20 seconds. if ((gmtime (time) - $remembered_sessions_status_since_time{@sinfo[1]}) >= 20) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git