[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.0.1-30-ge0dec6f

[X2Go dev team]

The branch, master has been updated
       via  e0dec6f1eb0e84ff19b5c59899758d85e6bb7ccc (commit)
      from  0cc560c98c5fb10d7efebabe2284dc88e8e990f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e0dec6f1eb0e84ff19b5c59899758d85e6bb7ccc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 16 09:06:52 2012 +0100

    Wait one second for x2goagent to write to session.log before updating the session state from 'S' to 'R' in the X2Go session database.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2goserver/bin/x2goresume-session |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 666bfb3..1eecc11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
       the new session state to the session.log file, the x2gocleansessions
       script will mark the session as suspended during the session
       resuming process.
+    - Wait one second for x2goagent to write to session.log before updating
+      the session state from 'S' to 'R' in the X2Go session database.
     - Add X2Go server script x2gogetstatus.
     - Add/enable debugging of x2gocleansessions.
     - Silence error messages if the agent's session.log file is not accessible
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 04d2eea..50cb638 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -169,7 +169,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
 	#		sleep 1;
 	#	fi
 	#done
-	$X2GO_LIB_PATH/x2goresume  "$X2GO_CLIENT" "$SESSION_NAME"  "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null
+	(sleep 1; $X2GO_LIB_PATH/x2goresume  "$X2GO_CLIENT" "$SESSION_NAME"  "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;)
 
 	# resume x2godesktopsharing, if it has been in use before the session got suspended
 	x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).