From 010c92cb73aec45a14cde4b3e90d1e6869dac8a1 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sun, 8 Nov 2020 20:20:04 -0800 Subject: [PATCH] Set photodb log_level from argv. --- frontends/etiquette_cli.py | 13 ++++++++++++- frontends/etiquette_flask/etiquette_flask_dev.py | 11 ++++++++--- frontends/etiquette_repl.py | 8 +++++++- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/frontends/etiquette_cli.py b/frontends/etiquette_cli.py index 65c55c8..dc7b0fa 100644 --- a/frontends/etiquette_cli.py +++ b/frontends/etiquette_cli.py @@ -3,9 +3,12 @@ import sys from voussoirkit import getpermission from voussoirkit import pathclass +from voussoirkit import vlogging import etiquette +LOG_LEVEL = vlogging.NOTSET + class CantFindPhotoDB(Exception): pass @@ -24,7 +27,12 @@ def find_photodb(): if path == path.parent: raise CantFindPhotoDB() path = path.parent - photodb = etiquette.photodb.PhotoDB(path.with_child('_etiquette'), create=False) + + photodb = etiquette.photodb.PhotoDB( + path.with_child('_etiquette'), + create=False, + log_level=LOG_LEVEL, + ) photodbs[path] = photodb return photodb @@ -215,6 +223,9 @@ def tag_breplace_argparse(args): photodb.commit() def main(argv): + global LOG_LEVEL + (LOG_LEVEL, argv) = vlogging.get_level_by_argv(argv) + parser = argparse.ArgumentParser(description=__doc__) subparsers = parser.add_subparsers() diff --git a/frontends/etiquette_flask/etiquette_flask_dev.py b/frontends/etiquette_flask/etiquette_flask_dev.py index 2e4b468..dec8a9e 100644 --- a/frontends/etiquette_flask/etiquette_flask_dev.py +++ b/frontends/etiquette_flask/etiquette_flask_dev.py @@ -17,14 +17,16 @@ import gevent.pywsgi import sys from voussoirkit import pathclass +from voussoirkit import vlogging import backend -#################################################################################################### - site = backend.site HTTPS_DIR = pathclass.Path(__file__).parent.with_child('https') +LOG_LEVEL = vlogging.NOTSET + +#################################################################################################### def etiquette_flask_launch( *, @@ -52,7 +54,7 @@ def etiquette_flask_launch( if localhost_only: site.localhost_only = True - backend.common.init_photodb(create=create) + backend.common.init_photodb(create=create, log_level=LOG_LEVEL) message = f'Starting server on port {port}' if use_https: @@ -73,6 +75,9 @@ def etiquette_flask_launch_argparse(args): ) def main(argv): + global LOG_LEVEL + (LOG_LEVEL, argv) = vlogging.get_level_by_argv(argv) + parser = argparse.ArgumentParser() parser.add_argument('port', nargs='?', type=int, default=5000) diff --git a/frontends/etiquette_repl.py b/frontends/etiquette_repl.py index 3b15d97..506c928 100644 --- a/frontends/etiquette_repl.py +++ b/frontends/etiquette_repl.py @@ -10,9 +10,12 @@ import sys import traceback from voussoirkit import getpermission +from voussoirkit import vlogging import etiquette +LOG_LEVEL = vlogging.NOTSET + def easytagger(): while True: i = input('> ') @@ -35,7 +38,7 @@ def photag(photo_id): def erepl_argparse(args): global P - P = etiquette.photodb.PhotoDB(create=args.create) + P = etiquette.photodb.PhotoDB(create=args.create, log_level=LOG_LEVEL) if args.exec_statement: exec(args.exec_statement) @@ -53,6 +56,9 @@ def erepl_argparse(args): break def main(argv): + global LOG_LEVEL + (LOG_LEVEL, argv) = vlogging.get_level_by_argv(argv) + parser = argparse.ArgumentParser() parser.add_argument('--exec', dest='exec_statement', default=None)