Browse Source

Fix getting loggers.

shellcheck
Darko Poljak 4 years ago
parent
commit
0c57b3083e
  1. 19
      cdist/config.py
  2. 2
      cdist/core/cdist_type.py
  3. 3
      scripts/cdist

19
cdist/config.py vendored

@ -165,24 +165,19 @@ class Config(object):
def commandline(cls, args):
"""Configure remote system"""
# FIXME: Refactor relict - remove later
log = logging.getLogger("cdist")
# No new child process if only one host at a time.
if args.parallel == 1:
log.debug("Only 1 parallel process, doing it sequentially")
args.parallel = 0
if args.parallel or args.jobs:
# If parallel execution then also log process id
if (args.parallel and args.parallel != 1) or args.jobs:
if args.timestamp:
cdist.log.setupTimestampingParallelLogging()
else:
cdist.log.setupParallelLogging()
log = logging.getLogger("cdist")
elif args.timestamp:
cdist.log.setupTimestampingLogging()
log = logging.getLogger("cdist")
log = logging.getLogger("config")
# No new child process if only one host at a time.
if args.parallel == 1:
log.debug("Only 1 parallel process, doing it sequentially")
args.parallel = 0
if args.parallel:
import signal

2
cdist/core/cdist_type.py vendored

@ -47,7 +47,7 @@ class CdistType(object):
"""
log = logging.getLogger("cdist")
log = logging.getLogger("cdist-type")
def __init__(self, base_path, name):
self.base_path = base_path

3
scripts/cdist

@ -69,8 +69,6 @@ if __name__ == "__main__":
import re
import os
log = logging.getLogger("cdist")
if re.match("__", os.path.basename(sys.argv[0])):
import cdist.emulator
emulator = cdist.emulator.Emulator(sys.argv)
@ -82,6 +80,7 @@ if __name__ == "__main__":
exit_code = 2
except cdist.Error as e:
log = logging.getLogger("cdist")
log.error(e)
exit_code = 1

Loading…
Cancel
Save