X2Go dev team | 18 Apr 17:09 2013

x2gobroker.git - master (branch) updated: 0.0.1.0-19-gf4ff0ae

The branch, master has been updated
       via  f4ff0ae355ed058f2fdf8e2267cb3ad7812e097c (commit)
      from  ca48248f7042f81ec2ba9d25907e0d2545007cc6 (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 f4ff0ae355ed058f2fdf8e2267cb3ad7812e097c
Author: Mike Gabriel <mike.gabriel@...>
Date:   Thu Apr 18 17:09:25 2013 +0200

    x2gobroker-pubkeyauthorizer: no logging-to-file support anymore (Fixes: #175).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    2 ++
 sbin/x2gobroker-pubkeyauthorizer |   36 +++++++++++-------------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d340550..d0dc080 100644
--- a/debian/changelog
+++ b/debian/changelog
 <at>  <at>  -11,6 +11,8  <at>  <at>  x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
     - Fix hard-coded path to x2gobroker's authservice socket.
     - Separate logging logic of x2gobroker-authservice from the rest of
       the logging in x2gobroker. (Fixes: #172).
+    - x2gobroker-pubkeyauthorizer: no logging-to-file support anymore.
+      (Fixes: #175).
   * /debian/control:
     + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
     + Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the
diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer
index 1b707d1..5609be3 100755
--- a/sbin/x2gobroker-pubkeyauthorizer
+++ b/sbin/x2gobroker-pubkeyauthorizer
 <at>  <at>  -66,34 +66,20  <at>  <at>  else:
 # the home directory of the user that the daemon/cgi runs as
 X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(broker_uid=X2GOBROKER_DAEMON_USER)))

-if os.geteuid() == 0:
+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=''))

-    # we run in standalone daemon mode, so let's use the system configuration for logging
-    logging.config.fileConfig(X2GOBROKER_LOGCONFIG)
+# all loggers stream to stderr...
+logger_root.addHandler(stderr_handler)

-    # create loggers
-    logger_broker = logging.getLogger('broker')
-    logger_error = logging.getLogger('error')
+logger_broker = logging.getLogger('broker')
+logger_broker.addHandler(stderr_handler)
+logger_broker.propagate = 0

-    # propagate msgs for  the broker logger to the root logger (i.e. to stderr)
-    logger_broker.propagate = 1
-    logger_error.propagate = 1
-
-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_error = logging.getLogger('error')
-    logger_error.addHandler(stderr_handler)
-    logger_error.propagate = 0
+logger_error = logging.getLogger('error')
+logger_error.addHandler(stderr_handler)
+logger_error.propagate = 0

 # raise log level to DEBUG if requested...
 if X2GOBROKER_DEBUG:

hooks/post-receive

Gmane