This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f9dd59dd656019f593d37d234a2859cc17696061 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 30 09:41:20 2018 +0100 bin/x2gobroker: Don't override already defined logger objects, define them properly where needed. --- bin/x2gobroker | 11 +++++++++-- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/x2gobroker b/bin/x2gobroker index b67b3a6..db73176 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -94,7 +94,9 @@ except ImportError: from x2gobroker import __VERSION__ from x2gobroker import __AUTHOR__ -from x2gobroker.loggers import logger_broker, logger_access, logger_error, tornado_log_request, PROG_NAME +import x2gobroker.loggers +tornado_log_request = x2gobroker.loggers.tornado_log_request +PROG_NAME = x2gobroker.loggers.PROG_NAME from x2gobroker.utils import drop_privileges, split_host_address interactive_mode_warning = False @@ -157,11 +159,16 @@ if __name__ == "__main__": if cmdline_args.debug_interactively: # recreate loggers... logger_broker, logger_access, logger_error = x2gobroker.loggers.init_console_loggers() - # override loggers in x2gobroker module... + # define our own debugging loggers x2gobroker.loggers.logger_broker = logger_broker x2gobroker.loggers.logger_broker = logger_access x2gobroker.loggers.logger_error = logger_error cmdline_args.debug = True + else: + # use already defined loggers from the x2gobroker.loggers module... + logger_broker = x2gobroker.loggers.logger_broker + logger_access = x2gobroker.loggers.logger_broker + logger_error = x2gobroker.loggers.logger_error # override X2GOBROKER_DEBUG=0 in os.environ with the command line switch if cmdline_args.debug: diff --git a/debian/changelog b/debian/changelog index 0fcf6d2..57f3f69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,8 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium - SSH broker: Add --login option. This now supports X2Go Broker user and X2Go Server username being different accounts. - bin/x2gobroker: Correctly use split_host_address() function call. + - bin/x2gobroker: Don't override already defined logger objects, define + them properly where needed. * debian/*: + Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git