Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch logging config to ini format

Browse Source 
Implement #61

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-11-18 16:09:07 +09:00
parent 5c110461ca
commit 6ab2a1fc6e
6 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aqt/cli.py
View File

@@ -28,8 +28,6 @@ import os
import platform
import sys
import yaml
from aqt.archives import QtArchives, ToolArchives
from aqt.installer import QtInstaller
@@ -141,7 +139,7 @@ class Cli():
parser = argparse.ArgumentParser(prog='aqt', description='Installer for Qt SDK.',
formatter_class=argparse.RawTextHelpFormatter, add_help=True)
parser.add_argument('--logging-conf', type=argparse.FileType('r'),
nargs=1, help="Specify logging configuration YAML file.")
nargs=1, help="Logging configuration ini file.")
parser.add_argument('--logger', nargs=1, help="Specify logger name")
parser.add_argument('--dry-run', action='store_true', help='Dry run operations.')
subparsers = parser.add_subparsers(title='subcommands', description='Valid subcommands',
@@ -198,10 +196,8 @@ class Cli():
elif envconf is not None:
conf = envconf
if conf is None or not os.path.exists(conf):
conf = os.path.join(os.path.dirname(__file__), 'logging.yml')
with open(conf, 'r') as f:
log_config = yaml.safe_load(f.read())
logging.config.dictConfig(log_config)
conf = os.path.join(os.path.dirname(__file__), 'logging.ini')
logging.config.fileConfig(conf)
if args.logger is not None:
self.logger = logging.getLogger(args.logger)
else: