[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-186-geb1f31f
X2Go dev team
git-admin at x2go.org
Sat Jun 22 11:48:55 CEST 2013
The branch, master has been updated
via eb1f31f259dd51fcf7245c05e83f3d64371cc261 (commit)
from c4f5a92d7ab5f231427d88e5fcc81a24a69faae1 (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 eb1f31f259dd51fcf7245c05e83f3d64371cc261
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Jun 22 11:07:11 2013 +0200
Revert "Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions."
This reverts commit c4f5a92d7ab5f231427d88e5fcc81a24a69faae1.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 --------
x2goserver/bin/x2goresume-session | 18 ++++++++++++++++--
2 files changed, 16 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d2b7ad9..19a3e4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,14 +51,6 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
-- Reinhard Tartler <siretart at tauware.de> Thu, 20 Dec 2012 10:15:26 +0100
-x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low
-
- * New upstream version (4.0.1.2):
- - Accelerate resuming of sessions. Fix failures when resuming sessions that
- result from the latest changes in x2gocleansessions.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200
-
x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low
* New upstream version (4.0.1.1):
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 3d01b0a..75d06d0 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -159,10 +159,24 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI
rm -Rf $SESSION_DIR/keyboard
kill -HUP $X2GO_AGENT_PID &>/dev/null && {
-
- $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME"
+ # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent
+
+ # we really have to make sure the session database gets this write operation
+ # this may just be an SQLite issue so...
+ # FIXME: probably migrate this piece of code to the SQLite db backend...
+ #while true; do
+ # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null
+ # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then
+ # break;
+ # else
+ # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..."
+ # sleep 1;
+ # fi
+ #done
+ (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;)
+
# set client-side keyboard model, type, variant, etc.
if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then
X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
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).
More information about the x2go-commits
mailing list