starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 00:22:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

cli._setup_logging

Browse Source
This commit is contained in:
Jakub Warmuz
2015-06-25 19:45:01 +00:00
parent 6ba133fc7c
commit 5b9a2f9637
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+17 -12
View File
@@ -573,6 +573,18 @@ def _paths_parser(helpful):
help=config_help("server")) help=config_help("server"))
def _setup_logging(args):
level = -args.verbose_count * 10
logging.getLogger().setLevel(level)
if args.text_mode:
handler = logging.StreamHandler()
else:
handler = log.DialogHandler()
handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT))
logging.getLogger().addHandler(handler)
logging.debug("Root logging level set at %d", level)
def main(cli_args=sys.argv[1:]): def main(cli_args=sys.argv[1:]):
"""Command line argument parsing and main script execution.""" """Command line argument parsing and main script execution."""
# note: arg parser internally handles --help (and exits afterwards) # note: arg parser internally handles --help (and exits afterwards)
@@ -587,23 +599,16 @@ def main(cli_args=sys.argv[1:]):
displayer = display_util.NcursesDisplay() displayer = display_util.NcursesDisplay()
zope.component.provideUtility(displayer) zope.component.provideUtility(displayer)
_setup_logging(args)
# do not log `args`, as it contains sensitive data (e.g. revoke --key)!
logging.debug("Arguments: %r", cli_args)
logging.debug("Discovered plugins: %r", plugins)
# Reporter # Reporter
report = reporter.Reporter() report = reporter.Reporter()
zope.component.provideUtility(report) zope.component.provideUtility(report)
atexit.register(report.atexit_print_messages) atexit.register(report.atexit_print_messages)
# Logging
level = -args.verbose_count * 10
logger = logging.getLogger()
logger.setLevel(level)
logging.debug("Logging level set at %d", level)
if not args.text_mode:
logger.addHandler(log.DialogHandler())
# do not log `args`, as it contains sensitive data (e.g. revoke --key)!
logging.debug("Arguments: %r", cli_args)
logging.debug("Discovered plugins: %r", plugins)
if not os.geteuid() == 0: if not os.geteuid() == 0:
logging.warning( logging.warning(
"Root (sudo) is required to run most of letsencrypt functionality.") "Root (sudo) is required to run most of letsencrypt functionality.")