x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-87-g1b9c36d
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 1b9c36dd6c9450bff46de5a6d308ba6e6f00c4f0 (commit) from e4de760985eec3ef1c4956548988d90dc0bdea8f (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 1b9c36dd6c9450bff46de5a6d308ba6e6f00c4f0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 13:01:43 2013 +0100 remove invalid comment ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 3 --- 1 file changed, 3 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 765aca2..0b4c881 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -236,9 +236,6 @@ else: def _application(environ, start_response): - ### FIXME: the code below causes AssertionErrors whenever we trigger a - ### tornado.web.HTTPError. Commenting out for now, may be removed - ### later. # some WSGI implementations do not like the SCRIPT_NAME env var if 'SCRIPT_NAME' in environ: del environ['SCRIPT_NAME'] 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.3-86-ge4de760
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via e4de760985eec3ef1c4956548988d90dc0bdea8f (commit) from a8c70b0a419e0d28623a6cfa6b32ea9d5c7364ba (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 e4de760985eec3ef1c4956548988d90dc0bdea8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 12:59:03 2013 +0100 fix AssertionErrors / web browser IO blocks when HTTPErrors occur ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/plain.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 11e6dee..5c28901 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -34,6 +34,7 @@ from x2gobroker.loggers import logger_broker, logger_error class _RequestHandler(tornado.web.RequestHandler): def _handle_request_exception(self, e): logger_error.error('HTTP request error: {error_msg}'.format(error_msg=unicode(e))) + tornado.web.RequestHandler._handle_request_exception(self, e) class X2GoBrokerWeb(_RequestHandler): 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.3-85-ga8c70b0
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via a8c70b0a419e0d28623a6cfa6b32ea9d5c7364ba (commit) from 0a0f24e434f76f05d8a9aed2feb1f6add7290aa3 (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 a8c70b0a419e0d28623a6cfa6b32ea9d5c7364ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 12:21:45 2013 +0100 parentheses fix(3) ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/plain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 354fc02..11e6dee 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -73,7 +73,7 @@ class X2GoBrokerWeb(_RequestHandler): exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) except ImportError: # throw a 404 if the backend does not exist - logger_error.error('No such broker backend \'{backend}\''.format(backend=backend))) + logger_error.error('No such broker backend \'{backend}\''.format(backend=backend)) raise tornado.web.HTTPError(404) global_config = broker_backend.get_global_config() 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.3-84-g0a0f24e
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 0a0f24e434f76f05d8a9aed2feb1f6add7290aa3 (commit) from ba5bf8ab50f031732d6aec892282f467a4ce8d23 (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 0a0f24e434f76f05d8a9aed2feb1f6add7290aa3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 12:18:16 2013 +0100 parentheses fix(2) ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/plain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index baf5f55..354fc02 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -73,7 +73,7 @@ class X2GoBrokerWeb(_RequestHandler): exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) except ImportError: # throw a 404 if the backend does not exist - logger_error.error('No such broker backend \'{backend}\''.format(backend=backend) + logger_error.error('No such broker backend \'{backend}\''.format(backend=backend))) raise tornado.web.HTTPError(404) global_config = broker_backend.get_global_config() 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.3-83-gba5bf8a
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via ba5bf8ab50f031732d6aec892282f467a4ce8d23 (commit) from 53adb07b76bb94e9a0e0aed5f65ba633016535ea (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 ba5bf8ab50f031732d6aec892282f467a4ce8d23 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 12:16:25 2013 +0100 parentheses fix ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/plain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 340cca7..baf5f55 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -85,7 +85,7 @@ class X2GoBrokerWeb(_RequestHandler): # if the broker backend is disabled in the configuration, pretend to have nothing on offer if not broker_backend.is_enabled(): - logger_error.error('The broker backend \'{backend}\' is not enabled'.format(backend=broker_backend.get_name()) + logger_error.error('The broker backend \'{backend}\' is not enabled'.format(backend=broker_backend.get_name())) raise tornado.web.HTTPError(404) # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138) 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.3-82-g53adb07
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 53adb07b76bb94e9a0e0aed5f65ba633016535ea (commit) from 9f9c0d251d2c8e425419b6538d7bc1cb6f28c620 (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 53adb07b76bb94e9a0e0aed5f65ba633016535ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 11:56:14 2013 +0100 add license header to x2gobroker-daemon-debug, test for EUID=0 before executing the session broker ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-daemon-debug | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index e80fb1f..bd500c3 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -1,4 +1,30 @@ #!/bin/bash +# -*- coding: utf-8 -*- + +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +if [[ $EUID -ne 0 ]]; then + echo "$(basename $0): You must be the root super-user to launch this command..." 2>&1 + exit 1 +fi if [ -e /etc/default/python-x2gobroker ]; then . /etc/default/python-x2gobroker @@ -10,4 +36,4 @@ fi export X2GOBROKER_DEBUG=true -su - x2gobroker -c "x2gobroker -M http -i" \ No newline at end of file +su - x2gobroker -c "x2gobroker -M http -i" 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.3-81-g9f9c0d2
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 9f9c0d251d2c8e425419b6538d7bc1cb6f28c620 (commit) from 03571aae698c75701ab323aca1d7f8bf9a885b8a (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 9f9c0d251d2c8e425419b6538d7bc1cb6f28c620 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 11:52:46 2013 +0100 install x2gobroker-daemon-debug into .deb package ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install index 7f70476..63b3e6f 100644 --- a/debian/x2gobroker-daemon.install +++ b/debian/x2gobroker-daemon.install @@ -1 +1,2 @@ -logrotate/x2gobroker-daemon etc/logrotate.d/ \ No newline at end of file +logrotate/x2gobroker-daemon etc/logrotate.d/ +sbin/x2gobroker-daemon-debug usr/sbin/ \ No newline at end of file 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.3-80-g03571aa
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 03571aae698c75701ab323aca1d7f8bf9a885b8a (commit) from 30cd766d9e8ac9b0ce52b7129dab52fca5068430 (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 03571aae698c75701ab323aca1d7f8bf9a885b8a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 11:51:25 2013 +0100 WebUI "plain": throw explainative log errors for every 404 http error. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 10 ++++++++++ x2gobroker/web/plain.py | 3 +++ 3 files changed, 14 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f3d71b3..d14eddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Add a start page (,,It works''). - Use IP addresses in apache2 config rather than hostnames. - Add new helper tool: x2gobroker-daemon-debug. + - WebUI "plain": throw explainative log errors for every 404 http error. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 1a9664a..8a35475 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -85,6 +85,16 @@ class X2GoBroker(object): """ return self.enabled + def get_name(self): + """\ + Accessor for self.backend_name property. + + @return: the backend name + @rtype: C{unicode} + + """ + return self.backend_name + def enable(self): """\ Enable this broker backend. diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 0ef2564..340cca7 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -73,16 +73,19 @@ class X2GoBrokerWeb(_RequestHandler): exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) except ImportError: # throw a 404 if the backend does not exist + logger_error.error('No such broker backend \'{backend}\''.format(backend=backend) raise tornado.web.HTTPError(404) global_config = broker_backend.get_global_config() # throw a 404 if the WebUI is not enabled if not global_config['enable-plain-output']: + logger_error.error('The WebUI \'plain\' is not enabled in the global broker configuration') raise tornado.web.HTTPError(404) # if the broker backend is disabled in the configuration, pretend to have nothing on offer if not broker_backend.is_enabled(): + logger_error.error('The broker backend \'{backend}\' is not enabled'.format(backend=broker_backend.get_name()) raise tornado.web.HTTPError(404) # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138) 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.3-79-g30cd766
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 30cd766d9e8ac9b0ce52b7129dab52fca5068430 (commit) from 0bed3dcbd4cda88b18e140617902a0458a98906f (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 30cd766d9e8ac9b0ce52b7129dab52fca5068430 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 11:36:02 2013 +0100 Add new helper tool: x2gobroker-daemon-debug. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 14 ++++++++++-- debian/changelog | 1 + sbin/x2gobroker-daemon-debug | 13 ++++++++++++ x2gobroker/defaults.py | 4 ++++ x2gobroker/loggers.py | 48 ++++++++++++++++++++++++++---------------- 5 files changed, 60 insertions(+), 20 deletions(-) create mode 100755 sbin/x2gobroker-daemon-debug The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index caaa103..765aca2 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -88,6 +88,7 @@ if __name__ == "__main__": {'args':['-M','--mode'], 'default': 'SSH', 'metavar': 'BROKER_MODE', 'help': 'Mode of the X2Go Session Broker to run ins (available: SSH, HTTP)', }, {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code; also: allow testing in web browser (make http\'s POST method available as GET method, as well)', }, + {'args':['-i','--debug-interactively'], 'default': False, 'action': 'store_true', 'help': 'force output of log message to the stderr (rather than to the log files)', }, ] daemon_options = [ {'args':['-b', '--bind'], 'default': None, 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, @@ -117,6 +118,15 @@ if __name__ == "__main__": if cmdline_args.config_file is not None: x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file + if cmdline_args.debug_interactively: + # recreate loggers... + logger_broker, logger_access, logger_error = x2gobroker.loggers.init_console_loggers() + # override loggers in x2gobroker module... + x2gobroker.loggers.logger_broker = logger_broker + x2gobroker.loggers.logger_broker = logger_access + x2gobroker.loggers.logger_error = logger_error + cmdline_args.debug = True + # override X2GOBROKER_DEBUG=0 in os.environ with the command line switch if cmdline_args.debug: x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug @@ -230,8 +240,8 @@ else: ### tornado.web.HTTPError. Commenting out for now, may be removed ### later. # some WSGI implementations do not like the SCRIPT_NAME env var - #if 'SCRIPT_NAME' in environ: - # del environ['SCRIPT_NAME'] + if 'SCRIPT_NAME' in environ: + del environ['SCRIPT_NAME'] # make sure the httpd server's environment is set as os.environ for key in environ.keys(): diff --git a/debian/changelog b/debian/changelog index 141e2e9..f3d71b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Fix check-credentials = false for UCCS web frontend. - Add a start page (,,It works''). - Use IP addresses in apache2 config rather than hostnames. + - Add new helper tool: x2gobroker-daemon-debug. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug new file mode 100755 index 0000000..e80fb1f --- /dev/null +++ b/sbin/x2gobroker-daemon-debug @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ -e /etc/default/python-x2gobroker ]; then + . /etc/default/python-x2gobroker +fi + +if [ -e /etc/default/x2gobroker-daemon ]; then + . /etc/default/x2gobroker-daemon +fi + +export X2GOBROKER_DEBUG=true + +su - x2gobroker -c "x2gobroker -M http -i" \ No newline at end of file diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index ab9844e..2d069d3 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -47,6 +47,10 @@ if os.environ.has_key('X2GOBROKER_DEBUG'): X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: X2GOBROKER_DEBUG = False +if os.environ.has_key('X2GOBROKER_DEBUG_INTERACTIVELY'): + X2GOBROKER_DEBUG_INTERACTIVELY = ( os.environ['X2GOBROKER_DEBUG_INTERACTIVELY'].lower() in ('1', 'on', 'true', 'yes', ) ) +else: + X2GOBROKER_DEBUG_INTERACTIVELY = False if os.environ.has_key('X2GOBROKER_TESTSUITE'): X2GOBROKER_TESTSUITE = ( os.environ['X2GOBROKER_TESTSUITE'].lower() in ('1', 'on', 'true', 'yes', ) ) else: diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index dd5e258..c0c0f2d 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -25,6 +25,35 @@ import getpass import logging import logging.config +def init_console_loggers(): + """\ + Initialize loggers that log to stderr. + + @return: a 3-tuple of (logger_broker, logger_access, logger_error) + @rtype: C{tuple] + """ + logger_root = logging.getLogger() + stderr_handler = logging.StreamHandler(sys.stderr) + stderr_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) + + # all loggers stream to stderr... + logger_root.addHandler(stderr_handler) + + logger_broker = logging.getLogger('broker') + logger_broker.addHandler(stderr_handler) + logger_broker.propagate = 0 + + logger_access = logging.getLogger('access') + logger_access.addHandler(stderr_handler) + logger_access.propagate = 0 + + logger_error = logging.getLogger('error') + logger_error.addHandler(stderr_handler) + logger_error.propagate = 0 + + return (logger_broker, logger_access, logger_error) + + # normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py... if os.environ.has_key('X2GOBROKER_DAEMON_USER'): X2GOBROKER_DAEMON_USER=os.environ['X2GOBROKER_DAEMON_USER'] @@ -47,24 +76,7 @@ if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root') and os.path.exists(X2GO logger_error = logging.getLogger('error') else: - logger_root = logging.getLogger() - stderr_handler = logging.StreamHandler(sys.stderr) - stderr_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) - - # all loggers stream to stderr... - logger_root.addHandler(stderr_handler) - - logger_broker = logging.getLogger('broker') - logger_broker.addHandler(stderr_handler) - logger_broker.propagate = 0 - - logger_access = logging.getLogger('access') - logger_access.addHandler(stderr_handler) - logger_access.propagate = 0 - - logger_error = logging.getLogger('error') - logger_error.addHandler(stderr_handler) - logger_error.propagate = 0 + logger_broker, logger_access, logger_error = init_console_loggers() def tornado_log_request(handler): """\ 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

x2goadmincenter.git - master (branch) updated: 35ffcf657fa5dbe2f6aed18430a5905bdc38bd45
by git-admin＠x2go.org 11 Dec '13

11 Dec '13

The branch, master has been updated via 35ffcf657fa5dbe2f6aed18430a5905bdc38bd45 (commit) from bb8b09956265a8249ee0db56afe3b566751b6f64 (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 35ffcf657fa5dbe2f6aed18430a5905bdc38bd45 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 11 11:27:26 2013 +0100 fix patching of lrelease binary path ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index 5c1cfb2..a0af650 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -66,7 +66,7 @@ sed -i x2goadminserver/Makefile -e '/^CGIBINDIR=/s,/lib/,/%{_lib}/,' %build %if 0%{?el5} sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' x2goadmincenter/Makefile -sed -i -e '/^LRELEASE_BINARY=/s@lrelease@%{_libdir}/qt4/bin/lrelease@' x2goadmincenter/Makefile +sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' x2goadmincenter/Makefile %endif make %{?_smp_mflags} hooks/post-receive -- x2goadmincenter.git (X2Go Administration Center) 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 "x2goadmincenter.git" (X2Go Administration Center).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013