x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-170-g7aa3976
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via 7aa3976cc3a0e357aa12939ac39f14fd534194a9 (commit) from 55039d87e27f13db56e1b0ff6afc75a0ce1031a6 (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 7aa3976cc3a0e357aa12939ac39f14fd534194a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:56:35 2013 +0200 another follow-up fix ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2gocleansessions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1b3eb13..58a1d91 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -138,7 +138,7 @@ elsif ($pid == 0 ) { syslog('debug', "@sinfo[1] is blocked"); - if defined $hash{ $key } + if (defined $blocked_sessions{ @sinfo[1] } { $blocked_sessions{@sinfo[1]} += 2; if ($blocked_sessions{@sinfo[1]} >= 20) { @@ -146,6 +146,7 @@ elsif ($pid == 0 ) # 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 $blocked_sessions{$session}; } } else { $blocked_sessions{@sinfo[1]} = 0; 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.0.x (branch) updated: 4.0.0.2-11-g2bb0600
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, release/4.0.0.x has been updated via 2bb06001886a03aa6da1325fbea680bbe6adb33b (commit) from 709571203da179ba6e4a46f9b68d9c354dfdc8d2 (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 2bb06001886a03aa6da1325fbea680bbe6adb33b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:56:35 2013 +0200 another follow-up fix ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2gocleansessions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 4b9f637..31caa39 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -140,7 +140,7 @@ elsif ($pid == 0 ) { syslog('debug', "@sinfo[1] is blocked"); - if defined $hash{ $key } + if (defined $blocked_sessions{ @sinfo[1] } { $blocked_sessions{@sinfo[1]} += 2; if ($blocked_sessions{@sinfo[1]} >= 20) { @@ -148,6 +148,7 @@ elsif ($pid == 0 ) # 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 $blocked_sessions{$session}; } } else { $blocked_sessions{@sinfo[1]} = 0; 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.0.x (branch) updated: 4.0.0.2-10-g7095712
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, release/4.0.0.x has been updated via 709571203da179ba6e4a46f9b68d9c354dfdc8d2 (commit) from 037a8b807fd2d30894ab51ec5ec6f51ebf04e832 (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 709571203da179ba6e4a46f9b68d9c354dfdc8d2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:54:37 2013 +0200 syntax fixes ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2gocleansessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1548e2b..4b9f637 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -129,7 +129,7 @@ elsif ($pid == 0 ) while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session} + delete $blocked_sessions{$session}; } } @@ -147,7 +147,7 @@ elsif ($pid == 0 ) { # 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]) + qw(kill -9 @sinfo[0]); } } else { $blocked_sessions{@sinfo[1]} = 0; 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-169-g55039d8
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via 55039d87e27f13db56e1b0ff6afc75a0ce1031a6 (commit) from fa9ee0403caa9d5272a5777e45c9caba015db509 (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 55039d87e27f13db56e1b0ff6afc75a0ce1031a6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:54:37 2013 +0200 syntax fixes ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2gocleansessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 604e6c1..1b3eb13 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -127,7 +127,7 @@ elsif ($pid == 0 ) while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session} + delete $blocked_sessions{$session}; } } @@ -145,7 +145,7 @@ elsif ($pid == 0 ) { # 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]) + qw(kill -9 @sinfo[0]); } } else { $blocked_sessions{@sinfo[1]} = 0; 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-168-gfa9ee04
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via fa9ee0403caa9d5272a5777e45c9caba015db509 (commit) from 6634b0e94f86673b9ecbd2281597e5335fd91b91 (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 fa9ee0403caa9d5272a5777e45c9caba015db509 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:52:32 2013 +0200 only remove old sessions from the DB if the agent process is gone (not while it is still there) ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2golistsessions_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 1d29bad..e1aa39a 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -58,7 +58,7 @@ my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); - if ((@ln[4] eq "F") && (check_pid(@ln[0], @ln[1])) + if ((@ln[4] eq "F") && (!check_pid(@ln[0], @ln[1])) { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); 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.0.x (branch) updated: 4.0.0.2-9-g037a8b8
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, release/4.0.0.x has been updated via 037a8b807fd2d30894ab51ec5ec6f51ebf04e832 (commit) from afeeb580215270c4a1658b6773c8cb2ff6d4e2ed (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 037a8b807fd2d30894ab51ec5ec6f51ebf04e832 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:52:32 2013 +0200 only remove old sessions from the DB if the agent process is gone (not while it is still there) ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2golistsessions_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index b667b4f..16d34be 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -59,7 +59,7 @@ my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); - if ((@ln[4] eq "F") && (check_pid(@ln[0], @ln[1])) + if ((@ln[4] eq "F") && (!check_pid(@ln[0], @ln[1])) { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); 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.0.x (branch) updated: 4.0.0.2-8-gafeeb58
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, release/4.0.0.x has been updated via afeeb580215270c4a1658b6773c8cb2ff6d4e2ed (commit) from dfe76c81c09a38819bac236020c2b49eeaede246 (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 afeeb580215270c4a1658b6773c8cb2ff6d4e2ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:43:34 2013 +0200 Send SIGKILL to blocked X-Server (x2goagent) processes, if they do not disappear within 20secs. (Fixes: #32). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2golistsessions_sql | 16 +++++++++++++++- x2goserver/sbin/x2gocleansessions | 29 +++++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cadd8be..64f8ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low in the session DB. - Add support for terminating sessions via the session DB. - Raise the frequency of the x2gocleansessions loop to every two seconds. + - Send SIGKILL to blocked X-Server (x2goagent) processes, if they do not + disappear within 20secs. (Fixes: #32). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 2957437..b667b4f 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -31,6 +31,20 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +sub check_pid +{ + my $pid=shift; + my $sess=shift; + open (F,"</proc/$pid/cmdline") or return 0; + my $text=<F>; + close (F); + if ($text =~ m/$sess/) + { + return 1; + } + return 0; +} + my $serv=shift; my @array; if($serv eq "--all-servers") @@ -45,7 +59,7 @@ my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); - if (@ln[4] eq "F") + if ((@ln[4] eq "F") && (check_pid(@ln[0], @ln[1])) { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index ca4f95a..1548e2b 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -118,18 +118,43 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; + my %blocked_sessions = (); + while(sleep 2) { my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; my @outp=split("\n","$outp"); + + # forget earlier remembered blocked sessions + while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { + if (! join(',', @outp)=~m/$session/) + { + delete $blocked_sessions{$session} + } + } + for (my $i=0;$i<@outp;$i++) { my @sinfo=split('\\|',"@outp[$i]"); if (@sinfo[4]eq 'F') { + syslog('debug', "@sinfo[1] is blocked"); - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + if defined $hash{ $key } + { + $blocked_sessions{@sinfo[1]} += 2; + if ($blocked_sessions{@sinfo[1]} >= 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]) + } + } else { + $blocked_sessions{@sinfo[1]} = 0; + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + } + } elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { 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-167-g6634b0e
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via 6634b0e94f86673b9ecbd2281597e5335fd91b91 (commit) from dd176a90d04b64ea0a49ccad52f5ca0b72d25673 (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 6634b0e94f86673b9ecbd2281597e5335fd91b91 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 6 01:43:34 2013 +0200 Send SIGKILL to blocked X-Server (x2goagent) processes, if they do not disappear within 20secs. (Fixes: #32). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2golistsessions_sql | 16 +++++++++++++++- x2goserver/sbin/x2gocleansessions | 29 +++++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 48c8bd3..304a871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low in the session DB. - Add support for terminating sessions via the session DB. - Raise the frequency of the x2gocleansessions loop to every two seconds. + - Send SIGKILL to blocked X-Server (x2goagent) processes, if they do not + disappear within 20secs. (Fixes: #32). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 0780ac5..1d29bad 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -30,6 +30,20 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); +sub check_pid +{ + my $pid=shift; + my $sess=shift; + open (F,"</proc/$pid/cmdline") or return 0; + my $text=<F>; + close (F); + if ($text =~ m/$sess/) + { + return 1; + } + return 0; +} + my $serv=shift; my @array; if($serv eq "--all-servers") @@ -44,7 +58,7 @@ my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); - if (@ln[4] eq "F") + if ((@ln[4] eq "F") && (check_pid(@ln[0], @ln[1])) { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 710c0e2..604e6c1 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -116,18 +116,43 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; + my %blocked_sessions = (); + while(sleep 2) { my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; my @outp=split("\n","$outp"); + + # forget earlier remembered blocked sessions + while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { + if (! join(',', @outp)=~m/$session/) + { + delete $blocked_sessions{$session} + } + } + for (my $i=0;$i<@outp;$i++) { my @sinfo=split('\\|',"@outp[$i]"); if (@sinfo[4]eq 'F') { + syslog('debug', "@sinfo[1] is blocked"); - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + if defined $hash{ $key } + { + $blocked_sessions{@sinfo[1]} += 2; + if ($blocked_sessions{@sinfo[1]} >= 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]) + } + } else { + $blocked_sessions{@sinfo[1]} = 0; + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + } + } elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { 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

x2gobroker.git - master (branch) updated: 0.0.2.2-11-ga3db857
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via a3db85708b2cee6d3600702e89c0131fafb1bb56 (commit) from 4070ad82a71e5d6cc628dd4cc464c348db027b28 (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 a3db85708b2cee6d3600702e89c0131fafb1bb56 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 5 13:19:26 2013 +0200 the UCCS backend requires the host parameter to be set ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 21ba225..16919b1 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -864,7 +864,7 @@ class X2GoBroker(object): if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' - profile['host'] = ['<will-be-provided-later>'] + profile['host'] = [profile['host'][0]] list_of_profiles.update({profile_id: profile, }) return list_of_profiles hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.2-10-g4070ad8
by git-admin＠x2go.org 05 Jun '13

05 Jun '13

The branch, master has been updated via 4070ad82a71e5d6cc628dd4cc464c348db027b28 (commit) from 1d5214de08f6716826ed311f1751bf58ebd8c66e (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 4070ad82a71e5d6cc628dd4cc464c348db027b28 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 5 13:10:15 2013 +0200 announce host/key with <will-be-provided-later> ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index d29714e..21ba225 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -846,7 +846,7 @@ class X2GoBroker(object): if self.use_session_autologin(profile_id): profile['autologin'] = True - profile['key'] = 'key-comes-later' + profile['key'] = '<will-be-provided-later>' # make sure that desktop sessions (that we know by name) do run with rootless=false if profile['command'] in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS: @@ -864,7 +864,7 @@ class X2GoBroker(object): if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' - profile['host'] = [] + profile['host'] = ['<will-be-provided-later>'] list_of_profiles.update({profile_id: profile, }) return list_of_profiles hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits