Incorporate server and cli into new code #13

Merged
Jaculabilis merged 16 commits from tvb/server into develop 2021-06-16 03:53:07 +00:00
1 changed files with 41 additions and 0 deletions
Showing only changes of commit 3890d4b11e - Show all commits

View File

@ -1,4 +1,34 @@
from argparse import ArgumentParser from argparse import ArgumentParser
import logging
import logging.config
LOGGING_CONFIG = {
"version": 1,
"formatters": {
"fmt_basic": {
"validate": True,
"format": "%(message)s",
},
"fmt_detailed": {
"validate": True,
"format": "%(asctime)s %(levelname)s %(message)s"
},
},
"handlers": {
"hnd_stderr": {
"class": "logging.StreamHandler",
"level": "INFO",
"formatter": "fmt_basic",
},
},
"loggers": {
__name__: {
"level": "DEBUG",
"handlers": ["hnd_stderr"]
}
},
}
def add_subcommand(subparsers, module) -> None: def add_subcommand(subparsers, module) -> None:
@ -33,6 +63,15 @@ def add_subcommand(subparsers, module) -> None:
subcommand.add_argument(*args, **kwargs) subcommand.add_argument(*args, **kwargs)
def init_logger(args):
"""Set up logging based on verbosity args"""
if (args.verbose):
handler = LOGGING_CONFIG["handlers"]["hnd_stderr"]
handler["formatter"] = "fmt_detailed"
handler["level"] = "DEBUG"
logging.config.dictConfig(LOGGING_CONFIG)
def main(): def main():
"""CLI entry point""" """CLI entry point"""
# Set up the top-level parser # Set up the top-level parser
@ -41,10 +80,12 @@ def main():
parser=parser, parser=parser,
func=lambda args: parser.print_usage(), func=lambda args: parser.print_usage(),
) )
parser.add_argument("--verbose", "-v", action="store_true", help="Verbose output")
# Add commands from cli submodules # Add commands from cli submodules
subparsers = parser.add_subparsers(metavar="COMMAND") subparsers = parser.add_subparsers(metavar="COMMAND")
# Parse args and execute the desired action # Parse args and execute the desired action
args = parser.parse_args() args = parser.parse_args()
init_logger(args)
args.func(args) args.func(args)