Use a terse logging line if --verbose is not specified
This commit is contained in:
@@ -106,32 +106,47 @@ from overviewer_core import googlemap, rendernode
|
||||
helptext = """
|
||||
%prog [OPTIONS] <World # / Name / Path to World> <tiles dest dir>"""
|
||||
|
||||
def configure_logger():
|
||||
def configure_logger(options=None):
|
||||
"Configures the root logger to our liking"
|
||||
|
||||
if not options:
|
||||
verbose = False
|
||||
else:
|
||||
verbose = options.verbose
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
outstream = sys.stderr
|
||||
if platform.system() == 'Windows':
|
||||
# Our custom output stream processor knows how to deal with select ANSI
|
||||
# color escape sequences
|
||||
outstream = util.WindowsOutputStream()
|
||||
formatter = util.ANSIColorFormatter()
|
||||
formatter = util.ANSIColorFormatter(verbose)
|
||||
|
||||
elif sys.stderr.isatty():
|
||||
# terminal logging with ANSI color
|
||||
formatter = util.ANSIColorFormatter()
|
||||
formatter = util.ANSIColorFormatter(verbose)
|
||||
|
||||
else:
|
||||
# Let's not assume anything. Just text.
|
||||
formatter = util.DumbFormatter()
|
||||
formatter = util.DumbFormatter(verbose)
|
||||
|
||||
logger = logging.getLogger()
|
||||
handler = logging.StreamHandler(outstream)
|
||||
handler.setFormatter(formatter)
|
||||
logger.addHandler(handler)
|
||||
logger.setLevel(logging.INFO)
|
||||
if hasattr(logger, 'overviewerHandler'):
|
||||
# we have already set up logging so just replace the formatter
|
||||
# this time with the new values from options
|
||||
logger.overviewerHandler.setFormatter(formatter)
|
||||
logger.setLevel(logger.level + 10*options.quiet)
|
||||
logger.setLevel(logger.level - 10*options.verbose)
|
||||
|
||||
else:
|
||||
logger.overviewerHandler = logging.StreamHandler(outstream)
|
||||
logger.overviewerHandler.setFormatter(formatter)
|
||||
logger.addHandler(logger.overviewerHandler)
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
def main():
|
||||
|
||||
# bootstrap the logger with defaults
|
||||
configure_logger()
|
||||
|
||||
try:
|
||||
@@ -173,6 +188,8 @@ def main():
|
||||
|
||||
options, args = parser.parse_args()
|
||||
|
||||
# the details of the logger options can depend on the command line options
|
||||
configure_logger(options)
|
||||
|
||||
if options.version:
|
||||
try:
|
||||
@@ -315,11 +332,6 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
|
||||
north_direction = options.north_direction
|
||||
else:
|
||||
north_direction = 'auto'
|
||||
|
||||
logging.getLogger().setLevel(
|
||||
logging.getLogger().level + 10*options.quiet)
|
||||
logging.getLogger().setLevel(
|
||||
logging.getLogger().level - 10*options.verbose)
|
||||
|
||||
if options.changelist:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user