[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-221-g3213e21
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:05:16 CET 2014
The branch, build-baikal has been updated
via 3213e219263cd50384e95330a35dda6b7cf9f861 (commit)
from 67164e2fc8618f6abcf4efc1acb78414805c0bdf (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
x2goserver/bin/x2gosuspend-session | 12 +++++-------
x2goserver/bin/x2goterminate-session | 4 +---
3 files changed, 7 insertions(+), 11 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9167afb..c3bbc75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,7 +38,6 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
script is called without session as first argument and $X2GO_SESSION
not set. (Fixes: #82).
* Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117).
- *
[ Otto Kjell ]
* New upstream version (4.1.0.0):
@@ -74,6 +73,7 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
- With PostgreSQL as session db backend, prevent the root user from
launching sessions. Also, prevent x2gouser_root from being added as a
PostgreSQL user. (Fixes: #310).
+ - Execute DB status changes as late as possible during suspend / terminate.
* /debian/control:
+ Update LONG_DESCRIPTIONS.
+ Move xfonts-base from Recommends: field to Depends: field (bin:package
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index fd97742..60d913b 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -45,8 +45,6 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
# workaround for knotify, keep silent in case no knotify is running
killall -HUP knotify &>/dev/null
-$X2GO_LIB_PATH/x2gochangestatus 'S' "$SESSION_NAME" > /dev/null
-
# terminate x2godesktopsharing instance and remember that it was running...
x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing "$SESSION_NAME" || true
@@ -59,20 +57,20 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
# run x2goserver-extensions for post-suspend
x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-suspend || true
+ $X2GO_LIB_PATH/x2gochangestatus 'S' "$SESSION_NAME" > /dev/null
+
} || {
err_msg="ERROR: failed to suspend session with ID $SESSION_NAME"
echo "$err_msg" 1>&2
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
- # If we reach here it means that the x2goagent process of the session has vanisshed
- # If this happens then we mark the session as finished...
- $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
-
# run x2goserver-extensions for fail-suspend
x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-suspend || true
+ # If we reach here it means that the x2goagent process of the session has vanisshed
+ # If this happens then we mark the session as finished...
+ $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
}
export HOSTNAME
x2goumount-session "$SESSION_NAME"
-
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index a4beeca..190c55f 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -42,8 +42,6 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"`
X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
-$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
-
# stop x2godesktopsharing process gracefully...
x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true
@@ -66,6 +64,6 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
# run x2goserver-extensions for fail-terminate
x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-terminate || true
-
}
+$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
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