x2go-commits March 2013

x2go-commits@lists.x2go.org

2 participants
1021 discussions

x2gobroker.git - tornado (branch) updated: 0.0.0.5-56-g30c5d79
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via 30c5d7913cd73b6172673983ee37160f3a5c9f71 (commit) from e9fd1798964afb34fdd2d11a1ec5b0d23628ff65 (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 30c5d7913cd73b6172673983ee37160f3a5c9f71 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]

1 0

x2gobroker.git - tornado (branch) updated: 0.0.0.5-55-ge9fd179
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via e9fd1798964afb34fdd2d11a1ec5b0d23628ff65 (commit) from 93a9f3f41318e472eb0ac964126a7189f4c80897 (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 e9fd1798964afb34fdd2d11a1ec5b0d23628ff65 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]gt; Date: Tue Mar 5 21:47:02 2013 +0100 fix log request diversion ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 76173b8..7d37091 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -39,7 +39,7 @@ except ImportError: from x2gobroker import __VERSION__ from x2gobroker import __AUTHOR__ -from x2gobroker.loggers import logger_broker, logger_access, logger_error +from x2gobroker.loggers import logger_broker, logger_access, logger_error, tornado_log_request # raise log level to DEBUG if requested... if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: @@ -120,18 +120,17 @@ urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), ) -application = tornado.web.Application(urls) +settings = { + 'log_function': tornado_log_request, +} +application = tornado.web.Application(urls, **settings) # run the web.py standalone daemon... if __name__ == "__main__": try: - settings = { - 'log_function': x2gobroker.loggers.tornado_log_request, - } if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: # switch on https:// mode http_server = tornado.httpserver.HTTPServer(application, - settings=settings, ssl_options={ "certfile": x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE, "keyfile": x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE, @@ -139,7 +138,7 @@ if __name__ == "__main__": ) else: # run without https - http_server = tornado.httpserver.HTTPServer(application, settings=settings) + http_server = tornado.httpserver.HTTPServer(application) http_server.listen(bind_port, address=bind_address) tornado.ioloop.IOLoop.instance().start() except socket.error, e: 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). [View Less]

1 0

x2gobroker.git - tornado (branch) updated: 0.0.0.5-54-g93a9f3f
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via 93a9f3f41318e472eb0ac964126a7189f4c80897 (commit) from 4a05d3411c0da68f013201e68b396f77a082344e (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 93a9f3f41318e472eb0ac964126a7189f4c80897 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]gt; Date: Tue Mar 5 21:32:54 2013 +0100 Divert tornado log requests into the broker's logger instances. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + sbin/x2gobroker | 6 +++++- x2gobroker/loggers.py | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0bfda42..4d452a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2gobroker (0.0.0.6-0~x2go1) UNRELEASED; urgency=low fallback to direct PAM authentication (only works if x2gobroker runs as super-user root). - Switch from webpy to using tornado as http engine. + - Divert tornado log requests into the broker's logger instances. * /debian/*.default: - Be more explanatory about the X2GOBROKER_DEBUG option and allow to enable debug mode for the different services independently. diff --git a/sbin/x2gobroker b/sbin/x2gobroker index d9420b0..76173b8 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -125,9 +125,13 @@ application = tornado.web.Application(urls) # run the web.py standalone daemon... if __name__ == "__main__": try: + settings = { + 'log_function': x2gobroker.loggers.tornado_log_request, + } if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: # switch on https:// mode http_server = tornado.httpserver.HTTPServer(application, + settings=settings, ssl_options={ "certfile": x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE, "keyfile": x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE, @@ -135,7 +139,7 @@ if __name__ == "__main__": ) else: # run without https - http_server = tornado.httpserver.HTTPServer(application) + http_server = tornado.httpserver.HTTPServer(application, settings=settings) http_server.listen(bind_port, address=bind_address) tornado.ioloop.IOLoop.instance().start() except socket.error, e: diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 5be50f3..fa0e3b1 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -70,3 +70,22 @@ else: logger_error = logging.getLogger('error') logger_error.addHandler(stderr_handler) logger_error.propagate = 0 + +def tornado_log_request(self, handler): + """\ + Function for overriding the log_request method in + C{tornado.web.RequestHandler}. + + @param handler: handler + @type handler: C{obj} + + """ + if handler.get_status() < 400: + log_method = logger_access.info + elif handler.get_status() < 500: + log_method = logger_access.warning + else: + log_method = logger_error.error + request_time = 1000.0 * handler.request.request_time() + log_method("%d %s %.2fms", handler.get_status(), + handler._request_summary(), request_time) 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). [View Less]

1 0

x2gobroker.git - tornado (branch) updated: 0.0.0.5-53-g4a05d34
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via 4a05d3411c0da68f013201e68b396f77a082344e (commit) from 01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0 (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 4a05d3411c0da68f013201e68b396f77a082344e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]gt; Date: Tue Mar 5 21:22:55 2013 +0100 Revert "use tornado terminology in get/post methods" This reverts commit 01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0. ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/html.py | 10 +++++----- x2gobroker/web/plain.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index 96d435c..d45f5d0 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -64,15 +64,15 @@ $output for http_header_item in self.http_header_items.keys(): self.add_header(http_header_item, self.http_header_items[http_header_item]) - def get(self, slug): - return self.post(slug) + def get(self, backend): + return self.post(backend) - def post(self, slug): + def post(self, backend): - if not slug: + if not backend: backend = _X2GOBROKER_DEFAULT_BACKEND else: - backend = slug.rstrip('/') + backend = backend.rstrip('/') # silence pyflakes... broker_backend = None diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index ac012d0..e4fa9aa 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -41,18 +41,18 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): for http_header_item in self.http_header_items.keys(): self.add_header(http_header_item, self.http_header_items[http_header_item]) - def get(self, slug): + def get(self, backend): if x2gobroker.defaults.X2GOBROKER_DEBUG: logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') - return self.post(slug) + return self.post(backend) raise tornado.web.HTTPError(404) - def post(self, slug): + def post(self, backend): - if not slug: + if not backend: backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: - backend = slug.rstrip('/') + backend = backend.rstrip('/') # silence pyflakes... broker_backend = None 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). [View Less]

1 0

x2gobroker.git - tornado (branch) updated: 0.0.0.5-52-g01f3a1d
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via 01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0 (commit) from 391fa36de255a6e17e817fe7127d85f81db015ee (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 01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]gt; Date: Tue Mar 5 21:21:22 2013 +0100 use tornado terminology in get/post methods ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/html.py | 10 +++++----- x2gobroker/web/plain.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index d45f5d0..96d435c 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -64,15 +64,15 @@ $output for http_header_item in self.http_header_items.keys(): self.add_header(http_header_item, self.http_header_items[http_header_item]) - def get(self, backend): - return self.post(backend) + def get(self, slug): + return self.post(slug) - def post(self, backend): + def post(self, slug): - if not backend: + if not slug: backend = _X2GOBROKER_DEFAULT_BACKEND else: - backend = backend.rstrip('/') + backend = slug.rstrip('/') # silence pyflakes... broker_backend = None diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index e4fa9aa..ac012d0 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -41,18 +41,18 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): for http_header_item in self.http_header_items.keys(): self.add_header(http_header_item, self.http_header_items[http_header_item]) - def get(self, backend): + def get(self, slug): if x2gobroker.defaults.X2GOBROKER_DEBUG: logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') - return self.post(backend) + return self.post(slug) raise tornado.web.HTTPError(404) - def post(self, backend): + def post(self, slug): - if not backend: + if not slug: backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: - backend = backend.rstrip('/') + backend = slug.rstrip('/') # silence pyflakes... broker_backend = None 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). [View Less]

1 0

x2gobroker.git - tornado (branch) updated: 0.0.0.5-51-g391fa36
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been updated via 391fa36de255a6e17e817fe7127d85f81db015ee (commit) from b6a0588c151b322dfcf2418b6d6df289946710d1 (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 391fa36de255a6e17e817fe7127d85f81db015ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de&… [View More]

1 0

python-tornado.git - pristine-tar (branch) created: a195b4c39ed4e35880234c8e3cf59e05fede47d7
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, pristine-tar has been created at a195b4c39ed4e35880234c8e3cf59e05fede47d7 (commit) - Log ----------------------------------------------------------------- commit a195b4c39ed4e35880234c8e3cf59e05fede47d7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 16:50:59 2013 +0100 pristine-tar data for python-tornado_2.3.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-tornado.… [View More]

1 0

python-tornado.git - upstream (branch) created: 69dc06cb804759622e242750d5dfbfcb74e0dcaf
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, upstream has been created at 69dc06cb804759622e242750d5dfbfcb74e0dcaf (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- python-tornado.git (python-tornado upstream project) 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 "python-tornado.… [View More]

1 0

python-tornado.git - master (branch) created: fb2cbb60f81aeeae0cf2eb5055bc630a9bde38d9
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, master has been created at fb2cbb60f81aeeae0cf2eb5055bc630a9bde38d9 (commit) - Log ----------------------------------------------------------------- commit fb2cbb60f81aeeae0cf2eb5055bc630a9bde38d9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 18:12:14 2013 +0100 backport for debian squeeze commit bfd721810efa532ea0fc245071b11d1b0f39fcff Author: Carl Chenet <chaica(a)debian.org> Date: Sun Jun 10 01:26:50 2012 +0200 … [View More]

1 0

x2gobroker.git - tornado (branch) created: 0.0.0.5-50-gb6a0588
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been created at b6a0588c151b322dfcf2418b6d6df289946710d1 (commit) - Log ----------------------------------------------------------------- commit b6a0588c151b322dfcf2418b6d6df289946710d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 18:06:31 2013 +0100 Switch from webpy to using tornado as http engine. commit 9fcd2186c96f07d41302fae68112e9b3dd7fb66e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2013