This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from e11f565 Make sure that incompletely started up sessions get wiped from the session DB after 10 seconds. new 246152a fix for last commit new ab1b79e place log message at correct position new 90dc33f follow-up for #626 bugfix The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 1 - x2goserver.spec | 1 - x2goserver/bin/x2goumount-session | 2 +- x2goserver/sbin/x2gocleansessions | 18 +++++++++--------- 4 files changed, 10 insertions(+), 12 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 246152a0a791aa7a98d8a5bd73a4ab9ce7e3f22b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 12:48:46 2014 +0200 fix for last commit --- x2goserver/sbin/x2gocleansessions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index b3b5f5a..c689802 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -23,7 +23,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::Remove 'remove'; +use File::Remove; use POSIX; @@ -202,7 +202,7 @@ elsif ($pid == 0 ) my $display = @sinfo[3]; if (-S "/tmp/.X11-unix/X$display") { # remove the NX-X11 socket file (as the agent will not have managed after a kill -9) - remove("/tmp/.X11-unix/X$display"); + File::Remove::remove("/tmp/.X11-unix/X$display"); } delete $remembered_sessions_since{@sinfo[1]}; } @@ -217,7 +217,7 @@ elsif ($pid == 0 ) if (-S "/tmp/.X11-unix/X$display") { # remove the NX-X11 socket file (we don't know how the agent disappeared, # someone might have shot it with kill -9) - remove("/tmp/.X11-unix/X$display"); + File::Remove::remove("/tmp/.X11-unix/X$display"); } syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit ab1b79e838e4561b227941eb1d6d33b9c66128ae Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 13:59:28 2014 +0200 place log message at correct position --- x2goserver/bin/x2goumount-session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index aab8734..7446d68 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -236,8 +236,8 @@ break: $desktop_file = "$remote\ (sshfs-cdrom$current_desktop)"; } - syslog('info', "Attempting removal of desktop file ,,$desktop_dir/$desktop_file''"); if ( -f "$desktop_dir/$desktop_file" ) { + syslog('info', "Attempting removal of desktop file ,,$desktop_dir/$desktop_file''"); open (DF,"<$desktop_dir/$desktop_file") or die "Can't open $desktop_file for reading"; my @desktop_file_content=<DF>; close(DF); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 90dc33f464e9bd3c093140032dd176574438a46e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 14:39:20 2014 +0200 follow-up for #626 bugfix Conflicts (resolved by Mike Gabriel): debian/control x2goserver/sbin/x2gocleansessions --- debian/control | 1 - x2goserver.spec | 1 - x2goserver/sbin/x2gocleansessions | 18 +++++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 4debd42..f531e7f 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,6 @@ Depends: libdbd-pg-perl, libdbd-sqlite3-perl, libfile-basedir-perl, - libfile-remove-perl, libcapture-tiny-perl, adduser, xauth, diff --git a/x2goserver.spec b/x2goserver.spec index 14c5725..e142d0c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -48,7 +48,6 @@ Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth -Requires: perl(Files::Remove) Requires(pre): shadow-utils Requires(post): grep Requires(post): perl(DBD::SQLite) diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index c689802..59afe91 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -23,7 +23,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::Remove; use POSIX; @@ -199,25 +198,26 @@ elsif ($pid == 0 ) # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); system("kill", "-9", "@sinfo[0]"); - my $display = @sinfo[3]; - if (-S "/tmp/.X11-unix/X$display") { - # remove the NX-X11 socket file (as the agent will not have managed after a kill -9) - File::Remove::remove("/tmp/.X11-unix/X$display"); - } delete $remembered_sessions_since{@sinfo[1]}; } + my $display = @sinfo[2]; + if (-S "/tmp/.X11-unix/X$display") { + # remove the NX-X11 socket file (as the agent will not have managed after a kill -9) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); + unlink("/tmp/.X11-unix/X$display"); + } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su", "@sinfo[11]", "-c", "export HOSTNAME && x2goumount-session @sinfo[1]"); } - elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { system("su", "@sinfo[11]", "-c", "$x2go_lib_path/x2gochangestatus 'F' @sinfo[1]"); - my $display = @sinfo[3]; + my $display = @sinfo[2]; if (-S "/tmp/.X11-unix/X$display") { # remove the NX-X11 socket file (we don't know how the agent disappeared, # someone might have shot it with kill -9) - File::Remove::remove("/tmp/.X11-unix/X$display"); + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); + unlink("/tmp/.X11-unix/X$display"); } syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org