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

[X2go dev team]

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

    notice message for x2goresume-session

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

Summary of changes:
 x2goserver/bin/x2gomountdirs      |    6 +++---
 x2goserver/bin/x2goresume-session |    4 +++-
 x2goserver/lib/x2goresume         |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 8396f42..dfa627c 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -272,19 +272,19 @@ for (my $i=0;$i<@dirs;$i++)
 				if ($type eq "dir")
 				{
 					$fname="$fname(sshfs-disk)";
-					syslog('debug', "creating desktop icon for @dirs[$i], media type is: client-side folder on harddrive");
+					syslog('info', "creating desktop icon for @dirs[$i], media type is: client-side folder on harddrive");
 				}
 				else
 				{
 					if ($fname =~ m/CDROM/)
 					{
 						$fname="$fname(sshfs-cdrom)";
-						syslog('debug', "creating desktop icon for @dirs[$i], media type is: optical disc");
+						syslog('info', "creating desktop icon for @dirs[$i], media type is: optical disc");
 					}
 					else
 					{
 						$fname="$fname(sshfs-removable)";
-						syslog('debug', "creating desktop icon for @dirs[$i], media type is: removable device");
+						syslog('info', "creating desktop icon for @dirs[$i], media type is: removable device");
 					}
 					$fname=~s/_ramdrive_mnt_//;
 				}
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index c41b314..4c01828 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -83,4 +83,6 @@ echo "$NEWOPTIONS" >${SESSION_DIR}/options
 
 $X2GO_LIB_PATH/x2goresume  $X2GO_CLIENT $SESSION_NAME  > /dev/null
 
-kill -HUP $X2GO_AGENT_PID
+kill -HUP $X2GO_AGENT_PID && \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || \
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: client $X2GO_CLIENT failed to resume session with ID $SESSION_NAME"
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index 8f038a7..028e34f 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -37,4 +37,4 @@ my $sid=shift or die;
 db_resume($client, $sid);
 
 # closing syslog 
-closelog;
\ No newline at end of file
+closelog;


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