The branch, master has been updated via 2ce613977c17b31475dc3207652daa00a78f2537 (commit) via d04c71a2781be037ebbb3bdc9441019409c9c2a8 (commit) from bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (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 2ce613977c17b31475dc3207652daa00a78f2537 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 17 12:01:36 2013 +0100 remove debug stdout code commit d04c71a2781be037ebbb3bdc9441019409c9c2a8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 17 11:59:34 2013 +0100 Add man page for x2gobroker executable. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gobroker.manpages | 1 + man/man8/x2gobroker.8 | 56 ++++++++++++++++++++++++++++++++++++++++++++ x2gobroker/loggers.py | 2 -- 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 debian/x2gobroker.manpages create mode 100644 man/man8/x2gobroker.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c8ec285..f1e7e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make host session option a list, not string. - Add load balancing support. - Add foundation for logging support. + - Add man page for x2gobroker executable. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages new file mode 100644 index 0000000..b010d6d --- /dev/null +++ b/debian/x2gobroker.manpages @@ -0,0 +1 @@ +man/man8/x2gobroker.8 \ No newline at end of file diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8 new file mode 100644 index 0000000..6782fda --- /dev/null +++ b/man/man8/x2gobroker.8 @@ -0,0 +1,56 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gobroker 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker \- Session Broker for X2Go +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API. +.PP +See the included README and TODO for further information on \fBx2gobroker\fR. +.SH COMMON OPTIONS +\fBx2gobroker\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +\*(T<\fB\-d, \-\-debug\fR\*(T> +Enable debugging code. This also makes http\'s POST method available as GET method, which then allows it to test the +broker API through a normal web browser. +.TP +\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> +Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. +.SH DAEMON OPTIONS +\fBx2gobroker\fR accepts the following daemon options: +.TP +\*(T<\fB\-b, \-\-bind ADDRESS:PORT\fR\*(T> +The [address:]port that the Web.py http-engine will bind to (default: 127.0.0.1:8080). +.SH "FILES" +/etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) +.PP +/etc/default/x2gobroker-daemon (environment for X2Go Session Broker when run +as standalone daemon) +.PP +/var/log/x2gobroker/* (log files of X2Go Session Broker) +.SH "SEE ALSO" +\fB/usr/share/doc/x2gobroker\fR +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel@das-netzwerkteam.de>. diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 4493091..01a659f 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -26,8 +26,6 @@ from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -print dir(logging.config) - # create loggers logger_broker = logging.getLogger('broker') logger_access = logging.getLogger('access') 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).