x2goserver.git - master (branch) updated: 3.0.99-2-252-g858bba0 - x2go-commits

10 Sep 2011

The branch, master has been updated
       via  858bba095723b6b801ae975ac8f89651cc737ad9 (commit)
       via  bb802fa01525d261d92e6bed6bf56a7a11e4fea9 (commit)
       via  165bdd743f9c5b5a37878fb5e0ecf5ca74542f58 (commit)
      from  8404361f7900534b81206aaefcef04c57d9e5910 (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 858bba095723b6b801ae975ac8f89651cc737ad9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 10 02:10:20 2011 +0200

    add log messages to x2goumount-session

commit bb802fa01525d261d92e6bed6bf56a7a11e4fea9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 10 02:10:06 2011 +0200

    add log messages to x2goruncommand

commit 165bdd743f9c5b5a37878fb5e0ecf5ca74542f58
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 10 02:09:45 2011 +0200

    log message fix for x2gostartagent

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

Summary of changes:
 x2goserver/bin/x2goruncommand     |    3 +++
 x2goserver/bin/x2gostartagent     |    4 ++--
 x2goserver/bin/x2goumount-session |    8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

The diff of changes is:

diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 6b038d9..7e8db47 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -110,14 +110,17 @@ then
 fi
 
 if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
+	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC"
 	$cmd
 	#### some applications can quit immediately, we will wait here as long as x2goagent exists
 	if [  "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]; then
+		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command $EXEC forked to background, waiting for agent to finish"
 		while [ -d /proc/$X2GO_AGENT_PID ]; do
 			sleep 1
 		done
 	fi
 else
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute"
 	echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE
 fi
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index fac17f6..699688b 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -227,8 +227,8 @@ fi
 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_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go agent session with ID $SESSION_NAME" || \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go agent session with ID $SESSION_NAME"
 
 X2GO_SND_PORT=1024
 
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index f63ee36..c69cd2c 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -89,6 +89,7 @@ for ($i=0;$i<@outp;$i++)
 		if (@mounts[$j]=~m/sshfs/ && @mounts[$j]=~m/@line[0]/ && @mounts[$j]=~m/@line[1]/ )
 		{
 			$found=1;
+			syslog('debug', "found mount point for @mounts[$j]");
 			$remote=(split(" ",@mounts[$j]))[0];
 			goto break;
 		}
@@ -98,11 +99,13 @@ break:
 	{
 		if (system( "fusermount -u @line[1]" ) == 0)
 		{
+			syslog('notice', "successfully mounted @line[1]");
 			$found=0;
 		}
 		else
 		{
 			$ENV{'DISPLAY'}=":$display";
+			syslog('err', "ERROR: failed to unmount @line[1]");
 			if ($use_zenity == 0)
 			{
 				system("kdialog --error \"@line[1]\"&");
@@ -120,15 +123,18 @@ break:
 		$remote="$ENV{'HOME'}/Desktop/$remote";
 		if ( -e "$remote(sshfs-disk)")
 		{
-		   unlink("$remote(sshfs-disk)");
+		    syslog('info', "removing desktop icon $remote(sshfs-disk)");
+		    unlink("$remote(sshfs-disk)");
 		}
 		$remote=~s/%2framdrive%2fmnt%2f//;
 		if ( -e "$remote(sshfs-removable)")
 		{
+			syslog('info', "removing desktop icon $remote(sshfs-removable)");
 			unlink("$remote(sshfs-removable)");
 		}
 		if ( -e "$remote(sshfs-cdrom)")
 		{
+			syslog('info', "removing desktop icon $remote(sshfs-cdrom)");
 			unlink("$remote(sshfs-cdrom)");
 		}
 		db_deletemount ($session, @line[1]);


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

    