This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from c3e7cc50 x2gostartsession: revert previous commit, this was not supposed to enter the master branch yet. new 443435f1 x2gocleansessions: Separate non-forking behavior from --debug into --nofork. The 1 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/changelog | 5 +++++ x2goserver/sbin/x2gocleansessions | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 443435f175ea078dabe481c5b5d883550d1e8e2e Author: Andrew J. Hesford <ajh@sideband.org> Date: Sun Jun 27 07:18:34 2021 +0200 x2gocleansessions: Separate non-forking behavior from --debug into --nofork. --- debian/changelog | 5 +++++ x2goserver/sbin/x2gocleansessions | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbec9f45..91bc6a36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium + [ Andrew J. Hesford ] + * New upstream versio (4.1.0.4): + - x2gocleansessions: Separate non-forking behavior from --debug into + --nofork. + [ Mike Gabriel ] * New upstream version (4.1.0.4): - Fix version number in VERSION.x2goserver-desktopsharing. diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 68ed9ef4..8bcb88b7 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -40,15 +40,17 @@ use Pod::Usage; Getopt::Long::Configure("gnu_getopt", "no_auto_abbrev"); my $debug = 0; +my $nofork = 0; my $help = 0; my $man = 0; -GetOptions('debug|d' => \$debug, 'help|?|h' => \$help, 'man' => \$man) or pod2usage(2); +GetOptions('debug|d' => \$debug, 'nofork|n' => \$nofork, 'help|?|h' => \$help, 'man' => \$man) or pod2usage(2); pod2usage(1) if $help; pod2usage(-verbose => 2, -exitval => 0) if $man; openlog($0,'cons,pid','user'); if ($debug) { + $nofork = 1; setlogmask( LOG_UPTO (LOG_DEBUG) ); } else @@ -98,12 +100,12 @@ my $uname; my $serv = hostname; my $pid; -if (! $debug) +if (! $nofork) { $pid = fork(); } -if ((!$debug) && (not defined $pid)) +if ((!$nofork) && (not defined $pid)) { print "resources not avilable.\n"; } @@ -145,7 +147,7 @@ elsif ($pid == 0 ) my $superenice_idle=$Config->param("superenicer.idle-nice-level"); my $superenice_ignoredusers=$Config->param("superenicer.ignored-users"); - if ( ! $debug ) + if ( ! $nofork ) { # close any open file descriptor left open by our parent before the fork my $fd; @@ -410,6 +412,8 @@ x2gocleansessions - X2Go Server Cleanup Daemon =item B<x2gocleansessions> [B<--debug>|B<-d>] +=item B<x2gocleansessions> [B<--nofork>|B<-d>] + =back =head1 DESCRIPTION @@ -433,8 +437,11 @@ Prints the manual page and exits. =item B<--debug>|B<-d> -Override debugging setting in global config and keep application in foreground -instead of daemonizing. +Override debugging setting in global config; implies B<--nofork>. + +=item B<--nofork>|B<-n> + +Keep application in foreground instead of daemonizing. =back -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org