The branch, master has been updated via 028c7499c8e11b9358f349f51b883b8e3a91479b (commit) via 1bff722ad44c6e7a6e49188fa10a57cef1cf198f (commit) from 5838372eb96984eb8985b34c21962e8701e22a08 (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 028c7499c8e11b9358f349f51b883b8e3a91479b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 28 16:55:53 2011 +0200 Terminate x2godesktopsharing for current session on x2goterminate-session or when x2goruncommand is about to exit. commit 1bff722ad44c6e7a6e49188fa10a57cef1cf198f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 28 16:52:44 2011 +0200 Add usage to x2gofeature, exit with -1 if feature is not available, with -2 if usage has been called. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gofeature | 4 +++- x2goserver/bin/x2goruncommand | 3 +++ x2goserver/bin/x2goterminate-session | 3 +++ 4 files changed, 11 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ab491b5..d0a7e55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,8 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low parallel installation of x2gognomebindings and x2golxdebindings. * Only remove server-side session directory if x2goruncommand has not failed. * Syntax fix in x2golistsessions_sql, hopefully fixes broken x2gocleansessions. + * Terminate x2godesktopsharing for current session on x2goterminate-session or + when x2goruncommand is about to exit. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 81c9245..6bb7d6a 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -20,6 +20,8 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +[ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } + X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` @@ -35,4 +37,4 @@ test -d $X2GO_SHARE_PATH/x2gofeature.d && { } echo "not available" -exit 0 +exit -1 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bd63873..0e5209b 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -127,6 +127,9 @@ else echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE fi +# stop x2godesktopsharing process gracefully... +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $SESSION_NAME + kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 5b1cd23..50357f3 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -35,6 +35,9 @@ 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 && x2godesktopsharing-terminate $SESSION_NAME + kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" } || { 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).