The branch, build-main has been updated via e34d0691e5830ab901da3ba0998a73e5f7fb0c31 (commit) from 2b634eef55315243b77ad07cd81d2c8e722e2542 (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: debian/changelog | 1 + .../broker/x2gobroker-authservice-logger.conf | 37 ++++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) copy x2gobroker/web/json.py => etc/broker/x2gobroker-authservice-logger.conf (62%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d3ab329..8195e1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - Fix name of get() method for /pubkeys/ URL path. (Fixes: #176). - Move AuthService server code fully into x2gobroker-authservice daemon script. + - Add forgotten file: x2gobroker-authservice-logger.conf. (Fixes: #180). * /debian/control: + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. + Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the diff --git a/x2gobroker/web/json.py b/etc/broker/x2gobroker-authservice-logger.conf similarity index 62% copy from x2gobroker/web/json.py copy to etc/broker/x2gobroker-authservice-logger.conf index 2e97f89..9c3e0c9 100644 --- a/x2gobroker/web/json.py +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> @@ -20,11 +18,36 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# modules -import tornado.web +# WARNING: only modify this file if you _exactly_ know what you are doing!!! + +[loggers] +keys=root,authservice + +[logger_root] +level=NOTSET +handlers=stderrHandler + +[handlers] +keys=stderrHandler,authserviceFileHandler + +[formatters] +keys=authserviceFormatter + +[handler_stderrHandler] +class=StreamHandler +args=(sys.stderr,) +[logger_authservice] +level=DEBUG +handlers=authserviceFileHandler +qualname=authservice +propagate=0 -class X2GoBrokerWeb(tornado.web.RequestHandler): +[handler_authserviceFileHandler] +class=FileHandler +formatter=authserviceFormatter +args=('/var/log/x2gobroker/authservice.log',) - # MUSIC OF THE FUTURE - pass \ No newline at end of file +[formatter_authserviceFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= 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).