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

[X2go dev team]

The branch, master has been updated
       via  8404361f7900534b81206aaefcef04c57d9e5910 (commit)
      from  7ebf1019b340513c7f666bd7d19329ad4cc5ce82 (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 8404361f7900534b81206aaefcef04c57d9e5910
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 10 01:29:21 2011 +0200

    log message fix for x2gostartagent

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

Summary of changes:
 x2goserver/bin/x2gostartagent |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 3527ac4..fac17f6 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -20,8 +20,6 @@
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
-set -e
-
 X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
@@ -226,9 +224,11 @@ else
 	LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
 fi
 
-$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go session with ID $SESSION_NAME"
-
 X2GO_AGENT_PID=$!
+X2GO_AGENT_RETVAL=$?
+test $X2GO_AGENT_RETVAL && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go session with ID $SESSION_NAME" || \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go session with ID $SESSION_NAME"
 
 X2GO_SND_PORT=1024
 


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