This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c9459abb7f6327e1247931defef44bf31f19d3be Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 7 20:06:53 2016 +0200 x2goserver/sbin/x2gocleansessions: add Perl documentation and --help, -h, -? and --man options. Fixes: #1065. Also print a usage message on unknown options. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 3 ++ x2goserver/sbin/x2gocleansessions | 57 +++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7be932c..3cfce3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -312,6 +312,9 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low OpenSSH server versions seem to disable the Blowfish cipher by default, leading to errors like "Connection reset by peer." - x2goserver/bin/x2goruncommand: whitespace only. + - x2goserver/sbin/x2gocleansessions: add Perl documentation and --help, + -h, -? and --man options. Fixes: #1065. Also print a usage message on + unknown options. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index baff6f9..03f899b 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -36,10 +36,63 @@ use X2Go::Server::DB qw( dbsys_rmsessionsroot ); use X2Go::Utils qw( system_capture_stdout_output is_true ); my $x2go_lib_path = system_capture_stdout_output("x2gopath", "libexec"); use Getopt::Long; +use Pod::Usage; +Getopt::Long::Configure("gnu_getopt", "no_auto_abbrev"); -my $debug; -GetOptions( 'debug' => \$debug ); +my $debug = 0; +my $help = 0; +my $man = 0; +GetOptions('debug|d' => \$debug, 'help|?|h' => \$help, 'man' => \$man) or pod2usage(2); +pod2usage(1) if $help; +pod2usage(-verbose => 2, -exitval => 0) if $man; + +__END__ +=head1 NAME + +x2gocleansessions - X2Go Server Cleanup Daemon + +=head1 SYNOPSIS + +x2gocleansessions [options] + + Options: + --help|-h|-? brief help message + --man full documentation + --debug enable debugging and don't daemonize + +=head1 OPTIONS + +=over 8 + +=item B<--help>|B<-?>|B<-h> + +Print a brief help message and exits. + +=item B<--man> + +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. + +=back + +=head1 DESCRIPTION + +B<x2gocleansessions> is run as a service on X2Go servers to handle the cleanup +of stale sessions. + +B<x2gocleansessions> must be run (as a service) with root privileges. + +=head1 AUTHOR + +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +for the X2Go project (http://www.x2go.org). + +=cut openlog($0,'cons,pid','user'); if ($debug) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git