x2gobroker.git - build-main (branch) updated: 0.0.0.5-55-ge9fd179 - x2go-commits

19 May 2013

The branch, build-main 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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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).

    