This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 87b97fb18999325c9de328fc9e1c6fe01054694f Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jun 23 15:49:10 2015 +0200 x2goserver/sbin/x2gocleansessions: don't use gmtime (time ()) but merely time (). The former one returns a formatted date-time string, which can't be checked by forming a difference. The latter one returns an UNIX timestamp, which is what we really want... minus leap seconds. Let's hope this doesn't bite back some time or later... Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 5 +++++ x2goserver/sbin/x2gocleansessions | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index be92575..36b2fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -222,6 +222,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low 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/sbin/x2gocleansessions: don't use gmtime (time ()) but merely + time (). The former one returns a formatted date-time string, which + can't be checked by forming a difference. The latter one returns an UNIX + timestamp, which is what we really want... minus leap seconds. Let's + hope this doesn't bite back some time or later... * 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 d94d6e2..c072db9 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -180,7 +180,7 @@ elsif ($pid == 0 ) # Clean up invalid sessions (i.e., those for which no nxagent process is running anymore) # from the session database, if the status didn't change for more than 10 seconds. - if ((!@sinfo[0]) && (defined ($remembered_sessions_status_since_time{@sinfo[1]})) && ((gmtime (time) - $remembered_sessions_status_since_time{@sinfo[1]}) >= 10)) + if ((!@sinfo[0]) && (defined ($remembered_sessions_status_since_time{@sinfo[1]})) && ((time () - $remembered_sessions_status_since_time{@sinfo[1]}) >= 10)) { dbsys_rmsessionsroot(@sinfo[1]); next; @@ -198,7 +198,7 @@ elsif ($pid == 0 ) # Record the status of either previously unseen or status-changing sessions and the current time. if (!(defined ($remembered_sessions_status_since_time{@sinfo[1]})) || ($remembered_sessions_status{@sinfo[1]} !~ m/@sinfo[4]/)) { $remembered_sessions_status{@sinfo[1]} = @sinfo[4]; - $remembered_sessions_status_since_time{@sinfo[1]} = gmtime (time); + $remembered_sessions_status_since_time{@sinfo[1]} = time (); $remembered_sessions_status_since_iterations{@sinfo[1]} = 0; } else { @@ -219,7 +219,7 @@ elsif ($pid == 0 ) } # Kill the process if blocked for more than 20 seconds. - if ((gmtime (time) - $remembered_sessions_status_since_time{@sinfo[1]}) >= 20) + if ((time () - $remembered_sessions_status_since_time{@sinfo[1]}) >= 20) { log_message ('debug', "@sinfo[1]: blocked for more than 20 seconds."); # send SIGKILL to dangling X-server processes -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git