x2goserver.git - master (branch) updated: 3.0.99-2-262-g12caae5 - x2go-commits

14 Sep 2011

The branch, master has been updated
       via  12caae569515ad64e779d5945d4d3eb11c960a30 (commit)
      from  a0a8126b3e594c84a6443d4e1839a6b73249315c (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 12caae569515ad64e779d5945d4d3eb11c960a30
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Sep 14 16:20:36 2011 +0200

    Add real error message if client fails to resume/suspend/terminate a session.

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

Summary of changes:
 debian/changelog                     |    2 ++
 x2goserver/bin/x2goresume-session    |   10 +++++++---
 x2goserver/bin/x2gosuspend-session   |   10 +++++++---
 x2goserver/bin/x2goterminate-session |   10 +++++++---
 4 files changed, 23 insertions(+), 9 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 3aebfcf..883e014 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     people do not get the idea to put users in x2gouser group.
   * Makefile and man page area fix for x2goserver-extensions.
   * x2goserver.postinst: fix home path updates if new home path already exists
+  * Add real error message if client fails to resume/suspend/terminate
+    a session.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 4c01828..49880e0 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -83,6 +83,10 @@ echo "$NEWOPTIONS" >${SESSION_DIR}/options
 
 $X2GO_LIB_PATH/x2goresume  $X2GO_CLIENT $SESSION_NAME  > /dev/null
 
-kill -HUP $X2GO_AGENT_PID && \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: client $X2GO_CLIENT failed to resume session with ID $SESSION_NAME"
+kill -HUP $X2GO_AGENT_PID &>/dev/null && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || {
+} || {
+       err_msg="ERROR: failed to resume session with ID $SESSION_NAME"
+       echo err_$msg 1>&2
+       $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
+}
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index ca342e4..139d0df 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -39,9 +39,13 @@ killall -HUP knotify
 
 $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME  > /dev/null
 
-kill -HUP $X2GO_AGENT_PID && \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to suspend session with ID $SESSION_NAME"
+kill -HUP $X2GO_AGENT_PID &>/dev/null && {
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || {
+} || {
+	err_msg="ERROR: failed to suspend session with ID $SESSION_NAME"
+	echo err_$msg 1>&2
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"B
+}
 
 export HOSTNAME 
 x2goumount-session $SESSION_NAME
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 3d8872e..75bf277 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -35,9 +35,13 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
 
 $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME  > /dev/null
 
-kill -TERM $X2GO_AGENT_PID && \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to terminate session with ID $SESSION_NAME"
+kill -TERM $X2GO_AGENT_PID &>/dev/null && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || {
+} || {
+       err_msg="ERROR: failed to terminate session with ID $SESSION_NAME"
+       echo "err_$msg" 1>&2
+       $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
+}
 
 export HOSTNAME
 x2goumount-session $SESSION_NAME


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).

    