This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 59c52b0 fix comment new 961ac08 fix for last commit new 67d24a6 place log message at correct position new 42e361f add syslog warning if X11 socket file cleanup occurs new 24219c0 follow-up for #626 bugfix The 4 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 master in repository x2goserver. commit 961ac08a949b021ce478b7a485e7229a14555a02 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 3d3be32..a0f27a0 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -26,7 +26,7 @@ $ENV{'PATH'} = "/bin:/sbin:/usr/bin:/usr/sbin"; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::Remove 'remove'; +use File::Remove; use POSIX; use X2Go::Config qw( get_config ); @@ -167,7 +167,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]}; } @@ -182,7 +182,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 master in repository x2goserver. commit 67d24a67029bf8536dec2edeac178dffb3b7212c 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 977698b..3b010f6 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -213,8 +213,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 master in repository x2goserver. commit 42e361f74457d5d7c61048809a31c49808732c93 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 14:03:36 2014 +0200 add syslog warning if X11 socket file cleanup occurs --- x2goserver/sbin/x2gocleansessions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index a0f27a0..54fee76 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -167,6 +167,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) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); File::Remove::remove("/tmp/.X11-unix/X$display"); } delete $remembered_sessions_since{@sinfo[1]}; @@ -182,6 +183,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) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /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"); -- 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 master in repository x2goserver. commit 24219c03330b891deb40d7784aba92a7619a73dd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 14:39:20 2014 +0200 follow-up for #626 bugfix --- debian/control | 1 - x2goserver.spec | 1 - x2goserver/sbin/x2gocleansessions | 18 ++++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index 6735b05..a713dd6 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Depends: x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), ${misc:Depends}, libfile-basedir-perl, - libfile-remove-perl, libtry-tiny-perl, libswitch-perl, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), diff --git a/x2goserver.spec b/x2goserver.spec index 96c6a1f..121f0ed 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -49,7 +49,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 54fee76..eb1bd3f 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -26,7 +26,6 @@ $ENV{'PATH'} = "/bin:/sbin:/usr/bin:/usr/sbin"; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::Remove; use POSIX; use X2Go::Config qw( get_config ); @@ -164,27 +163,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) - syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); - 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) syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); - File::Remove::remove("/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