From 31482e0658f5f0410431d63abefb7cb2e7e8cc66 Mon Sep 17 00:00:00 2001 Message-Id: <31482e0658f5f0410431d63abefb7cb2e7e8cc66.1489129769.git.hahn@univention.de> From: Philipp Hahn Date: Fri, 10 Mar 2017 08:09:21 +0100 Subject: [PATCH] Bug #43778 server: Improve logging Organization: Univention GmbH, Bremen, Germany Remove prefix "__main__." --- base/univention-server/univention-fix-ucr-dns | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/univention-server/univention-fix-ucr-dns b/base/univention-server/univention-fix-ucr-dns index 8dc8e4b..716c8ad 100755 --- a/base/univention-server/univention-fix-ucr-dns +++ b/base/univention-server/univention-fix-ucr-dns @@ -55,7 +55,7 @@ def main(): global options options = parse_args() setup_logging() - log = getLogger(__name__) + log = getLogger() if options.run_tests: run_tests() @@ -143,7 +143,7 @@ def parse_args(): def setup_logging(): - FORMAT = '%(asctime)-15s %(levelname)-7s %(name)-17s %(message)s' + FORMAT = '%(asctime)-15s %(levelname)-7s %(name)-8s %(message)s' LEVELS = [ERROR, WARNING, INFO, DEBUG] try: level = LEVELS[options.verbose] @@ -153,7 +153,7 @@ def setup_logging(): def get_forwarders(forwarders, ucr): - log = getLogger(__name__).getChild('ucr/fwd') + log = getLogger().getChild('ucr/fwd') log.debug('Reading external DNS forwarders from UCR...') need_fixing = False @@ -173,7 +173,7 @@ def get_forwarders(forwarders, ucr): def get_nameservers(nameservers, ucr): - log = getLogger(__name__).getChild('ucr/ns') + log = getLogger().getChild('ucr/ns') log.debug('Reading UCS domain servers from UCR...') need_fixing = False @@ -189,7 +189,7 @@ def get_nameservers(nameservers, ucr): def validate_servers(nameservers, forwarders, domain): - log = getLogger(__name__).getChild('val') + log = getLogger().getChild('val') if options.no_validation: log.info('Skip validation of DNS servers') return False @@ -213,7 +213,7 @@ def validate_servers(nameservers, forwarders, domain): def either_or(nameservers, forwarders): - log = getLogger(__name__).getChild('xor') + log = getLogger().getChild('xor') if not options.xor: log.info('Skip removing nameservers from forwarders') return False @@ -230,7 +230,7 @@ def either_or(nameservers, forwarders): def add_self(nameservers, ucr): - log = getLogger(__name__).getChild('ucr/self') + log = getLogger().getChild('ucr/self') if options.no_self: log.info('Skip adding self') return @@ -258,7 +258,7 @@ def add_self(nameservers, ucr): def add_nameservers(nameservers, domain): - log = getLogger(__name__).getChild('ns') + log = getLogger().getChild('ns') if not options.add_nameservers: log.info('Skip adding NS') return @@ -286,7 +286,7 @@ def add_nameservers(nameservers, domain): def add_master(nameservers, master): - log = getLogger(__name__).getChild('ldap') + log = getLogger().getChild('ldap') if not options.add_master: log.info('Skip adding master') return @@ -311,7 +311,7 @@ def add_master(nameservers, master): def update_ucr(ucr, nameservers, forwarders): - log = getLogger(__name__).getChild('ucr') + log = getLogger().getChild('ucr') new_ucr_settings = {} def update(names, values, typ): @@ -341,7 +341,7 @@ def update_ucr(ucr, nameservers, forwarders): def query_master_src_record(domain, server): - log = getLogger(__name__).getChild('dns/srv') + log = getLogger().getChild('dns/srv') rec = '_domaincontroller_master._tcp.%s.' % (domain.rstrip('.'),) log.debug('Querying %s for SRV %s', server, rec) @@ -381,7 +381,7 @@ def is_self(addr): >>> is_self('8.8.8.8') False """ - log = getLogger(__name__).getChild('ip') + log = getLogger().getChild('ip') env = dict(environ) env['LC_ALL'] = 'C' -- 2.1.4