[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-245-g6ea993c

[X2go dev team]

The branch, master has been updated
       via  6ea993ca763f779d849568a8e94644cf1d9a940d (commit)
      from  c3cd69695fa2e9cb6ea7b2dc48e48584d2f2e531 (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 6ea993ca763f779d849568a8e94644cf1d9a940d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 10 00:31:19 2011 +0200

    notice message for x2gosuspend-session, x2goterminate-session

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

Summary of changes:
 x2goserver/bin/x2gosuspend-session   |    5 +++--
 x2goserver/bin/x2goterminate-session |    5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index 490a276..08baed8 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -39,8 +39,9 @@ killall -HUP knotify
 
 $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME  > /dev/null
 
-
-kill -HUP $X2GO_AGENT_PID
+kill -HUP $X2GO_AGENT_PID && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully suspended session with ID $SESSION_NAME" || \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: client $X2GO_CLIENT failed to suspend session with ID $SESSION_NAME"
 
 export HOSTNAME 
 x2goumount-session $SESSION_NAME
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index eac5a4f..3a22111 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
 
-kill -TERM $X2GO_AGENT_PID
+kill -TERM $X2GO_AGENT_PID && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully terminated session with ID $SESSION_NAME" || \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: client $X2GO_CLIENT failed to terminate session with ID $SESSION_NAME"
+
 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).