[X2Go-Commits] x2gobroker.git - tmp (branch) updated: 0.0.0.1-8-gbbe2c8a

X2Go dev team git-admin at x2go.org
Tue Apr 23 21:08:43 CEST 2013


The branch, tmp has been updated
       via  bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (commit)
      from  fe7f06c112518bbac361c7e9f80ed721379a0e3b (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 +
 debian/python-x2gobroker.dirs                      |    3 +-
 ...r-agent.postinst => python-x2gobroker.postinst} |   27 +------
 ...roker-agent.postrm => python-x2gobroker.postrm} |   11 +--
 etc/broker/x2gobroker-loggers.conf                 |   81 ++++++++++++++++++++
 x2gobroker/defaults.py                             |    5 ++
 x2gobroker/{brokers/ldap_broker.py => loggers.py}  |   20 ++---
 7 files changed, 107 insertions(+), 41 deletions(-)
 copy debian/{x2gobroker-agent.postinst => python-x2gobroker.postinst} (51%)
 copy debian/{x2gobroker-agent.postrm => python-x2gobroker.postrm} (70%)
 create mode 100644 etc/broker/x2gobroker-loggers.conf
 copy x2gobroker/{brokers/ldap_broker.py => loggers.py} (68%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0984633..c8ec285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
     - Make CC, CFLAGS and LDFLAGS configurable through build system.
     - Make host session option a list, not string.
     - Add load balancing support.
+    - Add foundation for logging support.
   * /debian/control:
     + Add bin:package x2gobroker-agent.
 
diff --git a/debian/python-x2gobroker.dirs b/debian/python-x2gobroker.dirs
index 2fd303e..2396e1d 100644
--- a/debian/python-x2gobroker.dirs
+++ b/debian/python-x2gobroker.dirs
@@ -1,2 +1,3 @@
 /etc/x2go
-/etc/pam.d
\ No newline at end of file
+/etc/pam.d
+/var/log/x2gobroker
\ No newline at end of file
diff --git a/debian/x2gobroker-agent.postinst b/debian/python-x2gobroker.postinst
similarity index 51%
copy from debian/x2gobroker-agent.postinst
copy to debian/python-x2gobroker.postinst
index 95faece..861b3e0 100755
--- a/debian/x2gobroker-agent.postinst
+++ b/debian/python-x2gobroker.postinst
@@ -1,13 +1,10 @@
 #!/bin/sh
-# postinst script for x2gobroker-agent
+# postinst script for python-x2gobroker
 #
 # see: dh_installdeb(1)
 
 set -e
 
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -24,25 +21,9 @@ set -e
 case "$1" in
 	configure)
 
-		# setup user/group x2gobroker
-		if ! getent group x2gobroker >/dev/null; then
-			echo "Creating x2gobroker group." >&2
-			addgroup --system x2gobroker
-		else
-			echo "Group x2gobroker already exists." >&2
-		fi
-		if ! getent passwd x2gobroker >/dev/null; then
-			echo "Creating x2gobroker user." >&2
-			adduser --system --no-create-home \
-			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /dev/null x2gobroker
-		else
-			echo "User x2gobroker already exists." >&2
-		fi
-
-		# the x2gobroker-agent has to be installed setuid root
-		if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then
-		    dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent
+		# the python-x2gobroker needs special permissions on its log directory
+		if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+		    dpkg-statoverride --add --update x2gobroker adm 0750 /var/log/x2gobroker
 		fi
 
 		;;
diff --git a/debian/x2gobroker-agent.postrm b/debian/python-x2gobroker.postrm
similarity index 70%
copy from debian/x2gobroker-agent.postrm
copy to debian/python-x2gobroker.postrm
index d703d32..22abe93 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/python-x2gobroker.postrm
@@ -18,15 +18,10 @@ set -e
 
 case "$1" in
 	purge)
-		if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then
-			dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent
+		if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+			dpkg-statoverride --remove /var/log/x2gobroker
 		fi
 
-		# remove user/group x2gobroker from system
-		getent passwd x2gobroker >/dev/null && deluser x2gobroker
-		getent group x2gobroker >/dev/null && delgroup x2gobroker
-		getent group x2gobroker >/dev/null && delgroup x2gobroker
-
 		;;
 	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 		;;
@@ -41,4 +36,4 @@ esac
 
 #DEBHELPER#
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf
new file mode 100644
index 0000000..36d5e3e
--- /dev/null
+++ b/etc/broker/x2gobroker-loggers.conf
@@ -0,0 +1,81 @@
+# This file is part of the  X2Go Project - http://www.x2go.org
+# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2012 by Mike Gabriel <mike.gabriel at 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.
+
+[loggers]
+keys=root,broker,access,error
+
+[logger_root]
+level=NOTSET
+handlers=stdoutHandler
+
+[handlers]
+keys=stdoutHandler,brokerFileHandler,accessFileHandler,errorFileHandler
+
+[formatters]
+keys=brokerFormatter,accessFormatter,errorFormatter
+
+[handler_stdoutHandler]
+class=StreamHandler
+args=(sys.stdout,)
+
+[logger_broker]
+level=DEBUG
+handlers=brokerFileHandler
+qualname=broker
+propagate=0
+
+[handler_brokerFileHandler]
+class=FileHandler
+formatter=brokerFormatter
+args=('/var/log/x2gobroker/broker.log',)
+
+[formatter_brokerFormatter]
+format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
+datefmt=
+
+[logger_access]
+level=DEBUG
+handlers=accessFileHandler
+qualname=access
+propagate=0
+
+[handler_accessFileHandler]
+class=FileHandler
+formatter=accessFormatter
+args=('/var/log/x2gobroker/access.log',)
+
+[formatter_accessFormatter]
+format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
+datefmt=
+
+[logger_error]
+level=DEBUG
+handlers=errorFileHandler
+qualname=error
+propagate=0
+
+[handler_errorFileHandler]
+class=FileHandler
+formatter=accessFormatter
+args=('/var/log/x2gobroker/error.log',)
+
+[formatter_errorFormatter]
+format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
+datefmt=
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 48b61d8..b85a296 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'):
 else:
     X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
 
+if os.environ.has_key('X2GOBROKER_LOGCONFIG'):
+    X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG']
+else:
+    X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf"
+
 if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'):
     X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES']
 else:
diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/loggers.py
similarity index 68%
copy from x2gobroker/brokers/ldap_broker.py
copy to x2gobroker/loggers.py
index 61857d8..4493091 100644
--- a/x2gobroker/brokers/ldap_broker.py
+++ b/x2gobroker/loggers.py
@@ -2,6 +2,7 @@
 
 # Copyright (C) 2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.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
@@ -18,16 +19,17 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-"""\
-L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDAP as configuration backend
+import logging
+import logging.config
 
-"""
-__NAME__ = 'x2gobroker-pylib'
+from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG
 
-# modules
-import x2gobroker.base_broker as base
+logging.config.fileConfig(_X2GOBROKER_LOGCONFIG)
 
-class X2GoBroker(x2gobroker.base.X2GoBroker):
-    """\
+print dir(logging.config)
+
+# create loggers
+logger_broker = logging.getLogger('broker')
+logger_access = logging.getLogger('access')
+logger_error = logging.getLogger('error')
 
-    """


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




More information about the x2go-commits mailing list