[X2Go-Commits] [x2goserver] 02/02: Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 4ce866113a90c31d2736520361323c60e31c731f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 28 13:44:39 2014 +0100

    Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415).
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver/bin/x2gomountdirs
---
 debian/changelog             |    4 +++-
 x2goserver/bin/x2gomountdirs |    7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8618e0..ffaa5a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,7 +98,9 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
 
 x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low
 
-  * Continue development on main release/4.0.1.x branch...
+  * New upstream release (4.0.1.14):
+    - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log.
+      (Fixes: #415).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 28 Jan 2014 13:41:38 +0100
 
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index e17fc84..b545b3a 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -104,9 +104,10 @@ chmod(0600,"$key.ident");
 
 my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media";
 my $ldir="$ENV{'HOME'}/media";
-my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool";
+my $sessiondir="$ENV{'HOME'}/.x2go/C-$session";
+my $spooldir_lnk="$sessiondir/spool";
 my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool";
-my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox";
+my $mimeboxdir_lnk="$sessiondir/mimebox";
 my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox";
 
 source_environment(xdg_config_home() . "/user-dirs.dirs");
@@ -278,7 +279,7 @@ for (my $i=0;$i<@dirs;$i++)
 		print "inserted, $msg\n";
 
 		# FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file
-		if (system("sshfs  $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0)
+		if (system("sshfs  $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>&1 1>>$sessiondir/sshfs-mounts.log")==0)
 		{
 			print "mount @dirs[$i] ok\n";
 			syslog('notice', "successfully mounted $user\@$host:$port at dirs[$i] to $mntpath");

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git