x2goserver.git - master (branch) updated: 3.0.99-2-236-ga4838ac - x2go-commits

9 Sep 2011

The branch, master has been updated
       via  a4838ac43b89a0136978c29ddc7468eb42c691f0 (commit)
       via  eaf5a69eb51514fa7abb2ddf0647ae9330d18c67 (commit)
      from  085bdb5442060de5079a9e6aae6672db880051ee (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 a4838ac43b89a0136978c29ddc7468eb42c691f0
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Sep 9 22:45:42 2011 +0200

    Add debug messages to x2gomountdirs script.

commit eaf5a69eb51514fa7abb2ddf0647ae9330d18c67
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Sep 9 22:45:05 2011 +0200

    syslogging for x2gocmdexitmessage

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

Summary of changes:
 debian/changelog                  |    1 +
 x2goserver/bin/x2gocmdexitmessage |    4 ++++
 x2goserver/bin/x2gomountdirs      |   14 ++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 3982892..dba9904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a
     package. This has to be done by the scripts that use x2godbwrapper.pm.
   * Add info loglevel messages for x2goserver-extensions scripts.
+  * Add debug messages to x2gomountdirs script.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index 43dbf0f..8c96e92 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -20,8 +20,12 @@
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
 
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)"
+
 # return command output of the command that was issued by x2goruncommand
 cat $MESSAGE_FILE
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 3ca2504..1b62543 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -38,6 +38,7 @@ my $session=shift;
 my $user=shift;
 my $key=shift;
 my @dl;
+my $msg;
 my $i=0;
 @dl[$i]=shift;
 while(@dl[$i])
@@ -199,12 +200,14 @@ for (my $i=0;$i<@dirs;$i++)
 		@dirs[$i]=~s/__PRINT_SPOOL_//;
 		$printspool=1;
 		$mntpath=$spooldir;
+		syslog('debug', "mounting $spooldir, mount point type is print spool directory");
 	}
 	elsif(@dirs[$i]=~m/__MIMEBOX_SPOOL_/)
 	{
 		@dirs[$i]=~s/__MIMEBOX_SPOOL_//;
 		$mimeboxspool=1;
 		$mntpath=$mimeboxdir;
+		syslog('debug', "mounting $mimeboxdir, mount point type is MIME box directory");
 	}
 	else
 	{
@@ -266,16 +269,19 @@ for (my $i=0;$i<@dirs;$i++)
 				if ($type eq "dir")
 				{
 					$fname="$fname(sshfs-disk)";
+					syslog('debug', "@dirs[$i] mounted, mount point type is: client-side folder on harddrive");
 				}
 				else
 				{
 					if ($fname =~ m/CDROM/)
 					{
 						$fname="$fname(sshfs-cdrom)";
+						syslog('debug', "@dirs[$i] mounted, mount point type is: optical disc");
 					}
 					else
 					{
 						$fname="$fname(sshfs-removable)";
+						syslog('debug', "@dirs[$i] mounted, mount point type is: removable device");
 					}
 					$fname=~s/_ramdrive_mnt_//;
 				}
@@ -287,14 +293,18 @@ for (my $i=0;$i<@dirs;$i++)
 		}
 		else
 		{
-			print "mount @dirs[$i] failed\n";
+			$msg = "mounting of @dirs[$i] failed";
+			print "$msg\n";
+			syslog('warn', "WARNING: $msg");
 			db_deletemount( $session, $mntpath);
 			rmdir($mntpath);
 		}
 	}
 	else
 	{
-		print "insertion failed(already mounted?), not mounting\n";
+		$msg = "insertion of @dirs[$i] failed (already mounted?), not mounting";
+		syslog('warn', "WARNING: $msg");
+		print "$msg\n";
 	}
 }
 


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

    