x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.3-1-g74f823a
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c (commit) from 5e95a3c5c1462eb10f226505ebcc26c8197df306 (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 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:57:06 2013 +0200 Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goumount-session | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index df7c8f2..97ab7b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.5): + - Make x2goumount-session tolerant towards usernames that contain spaces + (Fixes: #202). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200 + x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 35d5642..a502090 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -62,7 +62,7 @@ my $tmp_dir = '/tmp'; my $session=shift; my $only_path=shift; -my $uname=$ENV{'USER'}; +my $uname="$ENV{'USER'}"; my $serv=hostname; my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; @@ -160,15 +160,15 @@ for ($i=0;$i<@outp;$i++) break: if ($found) { - if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0) + if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0) { - syslog('notice', "successfully unmounted @line[1]"); + syslog('notice', "successfully unmounted \"@line[1]\""); $found=0; } else { $ENV{'DISPLAY'}=":$display"; - syslog('err', "ERROR: failed to unmount @line[1]"); + syslog('err', "ERROR: failed to unmount \"@line[1]\""); if ($use_zenity == 0) { system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&"); 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-191-gdaca6ae
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via daca6ae5e260aef889cef8bc707ae89819b67c01 (commit) from 7d200b91029590cd77d6f011c9f04dddde64ea52 (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 daca6ae5e260aef889cef8bc707ae89819b67c01 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:57:06 2013 +0200 Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goumount-session | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cef9d99..48a874b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.5): + - Make x2goumount-session tolerant towards usernames that contain spaces + (Fixes: #202). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200 + x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 9112b5e..da2ddb9 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -38,7 +38,7 @@ my $tmp_dir = '/tmp'; my $session=shift; my $only_path=shift; -my $uname=$ENV{'USER'}; +my $uname="$ENV{'USER'}"; my $serv=hostname; my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; @@ -136,15 +136,15 @@ for ($i=0;$i<@outp;$i++) break: if ($found) { - if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0) + if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0) { - syslog('notice', "successfully unmounted @line[1]"); + syslog('notice', "successfully unmounted \"@line[1]\""); $found=0; } else { $ENV{'DISPLAY'}=":$display"; - syslog('err', "ERROR: failed to unmount @line[1]"); + syslog('err', "ERROR: failed to unmount \"@line[1]\""); if ($use_zenity == 0) { system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&"); 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).

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.3
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, build-main has been updated via 5e95a3c5c1462eb10f226505ebcc26c8197df306 (commit) from 666e84841eb39f7961ea0731fe29b05fca4c07cb (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a1e4b4b..df7c8f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.3): - Improve session status management in x2gocleansessions. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:32:41 +0200 x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.2-2-g666e848
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, build-main has been updated via 666e84841eb39f7961ea0731fe29b05fca4c07cb (commit) from 95ed41f7d7cf129ca635fcd78959b9f41db2244c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index df5bf58..67dc8a8 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index df5bf58..67dc8a8 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index df5bf58..67dc8a8 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index df5bf58..67dc8a8 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index df5bf58..67dc8a8 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index df5bf58..67dc8a8 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index df5bf58..67dc8a8 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file 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).

1 0

x2goserver.git - build-main (branch) updated: 4.0.1.2-1-g95ed41f
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, build-main has been updated via 95ed41f7d7cf129ca635fcd78959b9f41db2244c (commit) from 02ce6b450e39d07617d95e6a334573f3dd31ee8d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver/sbin/x2gocleansessions | 26 +++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2798097..a1e4b4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.3): + - Improve session status management in x2gocleansessions. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.2): diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 2a69281..e2a784a 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -95,13 +95,12 @@ sub catch_term } my $uname; -#my $serv=$ENV{'HOSTNAME'}; my $serv = hostname; my $pid = fork(); if (not defined $pid) { print "resources not avilable.\n"; -} +} elsif ($pid != 0) { open (F,">/var/run/x2goserver.pid"); @@ -116,7 +115,8 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %remembered_sessions = (); + my %remembered_sessions_status = (); + my %remembered_sessions_since = (); while(sleep 2) { @@ -124,11 +124,12 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $remembered_time) = each(%remembered_sessions) ) + while ( my ($session, $remembered_since) = each(%remembered_sessions_since) ) { if (! join(',', @outp)=~m/$session/) { - delete $remembered_sessions{$session}; + delete $remembered_sessions_status{$session}; + delete $remembered_sessions_since{$session}; } } @@ -137,22 +138,25 @@ elsif ($pid == 0 ) my @sinfo=split('\\|',"@outp[$i]"); - if (defined $remembered_sessions{ @sinfo[1] }) + if (defined $remembered_sessions_since{ @sinfo[1] } && ($remembered_sessions_status{ @sinfo[1] } =~m/@sinfo[4]/ )) { - $remembered_sessions{ @sinfo[1] } += 2; + $remembered_sessions_since{ @sinfo[1] } += 2; } else { - $remembered_sessions{ @sinfo[1] } = 0; + $remembered_sessions_status{ @sinfo[1] } = @sinfo[4]; + $remembered_sessions_since{ @sinfo[1] } = 0; } + #print @sinfo[1], ': ', $remembered_sessions_since{@sinfo[1]},' ',$remembered_sessions_status{@sinfo[1]},"\n"; + if (@sinfo[4]eq 'F') { syslog('debug', "@sinfo[1] is blocked"); - if ($remembered_sessions{@sinfo[1]} ge 20) + if ($remembered_sessions_since{@sinfo[1]} ge 20) { # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); qw(kill -9 @sinfo[0]); - delete $remembered_sessions{@sinfo[1]}; + delete $remembered_sessions_since{@sinfo[1]}; } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); @@ -167,7 +171,7 @@ elsif ($pid == 0 ) } else { - if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions_since{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-190-g7d200b9
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via 7d200b91029590cd77d6f011c9f04dddde64ea52 (commit) from 1c0a9e6df459e78497da0e618b7e36b85ef0a31c (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 7d200b91029590cd77d6f011c9f04dddde64ea52 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:33:09 2013 +0200 release 4.0.1.3 (cherry-picked from release/4.0.1.x branch) Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 734de12..cef9d99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,12 +51,12 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.3): - Improve session status management in x2gocleansessions. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:32:41 +0200 x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.3
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 5e95a3c5c1462eb10f226505ebcc26c8197df306 (commit) from 666e84841eb39f7961ea0731fe29b05fca4c07cb (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 5e95a3c5c1462eb10f226505ebcc26c8197df306 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:33:09 2013 +0200 release 4.0.1.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a1e4b4b..df7c8f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.3): - Improve session status management in x2gocleansessions. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:32:41 +0200 x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.2-2-g666e848
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 666e84841eb39f7961ea0731fe29b05fca4c07cb (commit) from 95ed41f7d7cf129ca635fcd78959b9f41db2244c (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 666e84841eb39f7961ea0731fe29b05fca4c07cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:32:28 2013 +0200 increment version on release/4.0.1.x branch ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index df5bf58..67dc8a8 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index df5bf58..67dc8a8 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index df5bf58..67dc8a8 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index df5bf58..67dc8a8 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index df5bf58..67dc8a8 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index df5bf58..67dc8a8 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index df5bf58..67dc8a8 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.2 \ No newline at end of file +4.0.1.3 \ No newline at end of file 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-189-g1c0a9e6
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via 1c0a9e6df459e78497da0e618b7e36b85ef0a31c (commit) from 3e017b6dd37da6cef42af819d19c6b002ca96358 (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 1c0a9e6df459e78497da0e618b7e36b85ef0a31c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:31:13 2013 +0200 Improve session status management in x2gocleansessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver/sbin/x2gocleansessions | 26 +++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ccf0f40..734de12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.3): + - Improve session status management in x2gocleansessions. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.2): diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 6dc9b5d..3c9bbf0 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -93,13 +93,12 @@ sub catch_term } my $uname; -#my $serv=$ENV{'HOSTNAME'}; my $serv = hostname; my $pid = fork(); if (not defined $pid) { print "resources not avilable.\n"; -} +} elsif ($pid != 0) { open (F,">/var/run/x2goserver.pid"); @@ -114,7 +113,8 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %remembered_sessions = (); + my %remembered_sessions_status = (); + my %remembered_sessions_since = (); while(sleep 2) { @@ -122,11 +122,12 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $remembered_time) = each(%remembered_sessions) ) + while ( my ($session, $remembered_since) = each(%remembered_sessions_since) ) { if (! join(',', @outp)=~m/$session/) { - delete $remembered_sessions{$session}; + delete $remembered_sessions_status{$session}; + delete $remembered_sessions_since{$session}; } } @@ -135,22 +136,25 @@ elsif ($pid == 0 ) my @sinfo=split('\\|',"@outp[$i]"); - if (defined $remembered_sessions{ @sinfo[1] }) + if (defined $remembered_sessions_since{ @sinfo[1] } && ($remembered_sessions_status{ @sinfo[1] } =~m/@sinfo[4]/ )) { - $remembered_sessions{ @sinfo[1] } += 2; + $remembered_sessions_since{ @sinfo[1] } += 2; } else { - $remembered_sessions{ @sinfo[1] } = 0; + $remembered_sessions_status{ @sinfo[1] } = @sinfo[4]; + $remembered_sessions_since{ @sinfo[1] } = 0; } + #print @sinfo[1], ': ', $remembered_sessions_since{@sinfo[1]},' ',$remembered_sessions_status{@sinfo[1]},"\n"; + if (@sinfo[4]eq 'F') { syslog('debug', "@sinfo[1] is blocked"); - if ($remembered_sessions{@sinfo[1]} ge 20) + if ($remembered_sessions_since{@sinfo[1]} ge 20) { # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); qw(kill -9 @sinfo[0]); - delete $remembered_sessions{@sinfo[1]}; + delete $remembered_sessions_since{@sinfo[1]}; } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); @@ -165,7 +169,7 @@ elsif ($pid == 0 ) } else { - if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions_since{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.2-1-g95ed41f
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 95ed41f7d7cf129ca635fcd78959b9f41db2244c (commit) from 02ce6b450e39d07617d95e6a334573f3dd31ee8d (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 95ed41f7d7cf129ca635fcd78959b9f41db2244c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 14:31:13 2013 +0200 Improve session status management in x2gocleansessions. Conflicts (resolved by Mike Gabriel) debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver/sbin/x2gocleansessions | 26 +++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2798097..a1e4b4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.3): + - Improve session status management in x2gocleansessions. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200 + x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.2): diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 2a69281..e2a784a 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -95,13 +95,12 @@ sub catch_term } my $uname; -#my $serv=$ENV{'HOSTNAME'}; my $serv = hostname; my $pid = fork(); if (not defined $pid) { print "resources not avilable.\n"; -} +} elsif ($pid != 0) { open (F,">/var/run/x2goserver.pid"); @@ -116,7 +115,8 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %remembered_sessions = (); + my %remembered_sessions_status = (); + my %remembered_sessions_since = (); while(sleep 2) { @@ -124,11 +124,12 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $remembered_time) = each(%remembered_sessions) ) + while ( my ($session, $remembered_since) = each(%remembered_sessions_since) ) { if (! join(',', @outp)=~m/$session/) { - delete $remembered_sessions{$session}; + delete $remembered_sessions_status{$session}; + delete $remembered_sessions_since{$session}; } } @@ -137,22 +138,25 @@ elsif ($pid == 0 ) my @sinfo=split('\\|',"@outp[$i]"); - if (defined $remembered_sessions{ @sinfo[1] }) + if (defined $remembered_sessions_since{ @sinfo[1] } && ($remembered_sessions_status{ @sinfo[1] } =~m/@sinfo[4]/ )) { - $remembered_sessions{ @sinfo[1] } += 2; + $remembered_sessions_since{ @sinfo[1] } += 2; } else { - $remembered_sessions{ @sinfo[1] } = 0; + $remembered_sessions_status{ @sinfo[1] } = @sinfo[4]; + $remembered_sessions_since{ @sinfo[1] } = 0; } + #print @sinfo[1], ': ', $remembered_sessions_since{@sinfo[1]},' ',$remembered_sessions_status{@sinfo[1]},"\n"; + if (@sinfo[4]eq 'F') { syslog('debug', "@sinfo[1] is blocked"); - if ($remembered_sessions{@sinfo[1]} ge 20) + if ($remembered_sessions_since{@sinfo[1]} ge 20) { # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); qw(kill -9 @sinfo[0]); - delete $remembered_sessions{@sinfo[1]}; + delete $remembered_sessions_since{@sinfo[1]}; } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); @@ -167,7 +171,7 @@ elsif ($pid == 0 ) } else { - if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions_since{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits