The branch, master has been updated via 4633331368c021e95e973bee3f8fa133d4e6929d (commit) from 9303888dcae2b150bcf0a990c30b43c3647363d7 (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 4633331368c021e95e973bee3f8fa133d4e6929d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jan 19 16:43:42 2013 +0100 fix x2golistshadowsessions code ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 2 +- x2goserver/bin/x2golistshadowsessions | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index 5fda1a2..3216317 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -66,7 +66,7 @@ use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', - 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts'); + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts', 'db_listshadowsessions','db_listshadowsessions_all'); sub dbsys_rmsessionsroot { diff --git a/x2goserver/bin/x2golistshadowsessions b/x2goserver/bin/x2golistshadowsessions index 6c11455..4a1a7f4 100755 --- a/x2goserver/bin/x2golistshadowsessions +++ b/x2goserver/bin/x2golistshadowsessions @@ -37,17 +37,17 @@ if ( @ARGV ) { syslog('debug', "x2golistshadowsessions has been called with no option"); } -#sub check_stat -#{ -# my $sess=shift; -# my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; -# my $text=`tail -1 $log 2>/dev/null`; -# if ($text =~ m/Session suspended/) -# { -# return 0; -# } -# return 1; -#} +sub check_stat +{ + my $sess=shift; + my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; + my $text=`tail -1 $log 2>/dev/null`; + if ($text =~ m/Session suspended/) + { + return 0; + } + return 1; +} my $serv=shift; if( ! $serv) 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).