gpg: use same logging configuration as in SSH

trezor_agent/__main__.py

@@ -73,15 +73,6 @@ def create_git_parser():
     return p
 
 
-def setup_logging(verbosity):
-    """Configure logging for this tool."""
-    fmt = ('%(asctime)s %(levelname)-12s %(message)-100s '
-           '[%(filename)s:%(lineno)d]')
-    levels = [logging.WARNING, logging.INFO, logging.DEBUG]
-    level = levels[min(verbosity, len(levels) - 1)]
-    logging.basicConfig(format=fmt, level=level)
-
-
 def git_host(remote_name, attributes):
     """Extract git SSH host for specified remote name."""
     try:
@@ -132,7 +123,7 @@ def handle_connection_error(func):
 def run_agent(client_factory=client.Client):
     """Run ssh-agent using given hardware client factory."""
     args = create_agent_parser().parse_args()
-    setup_logging(verbosity=args.verbose)
+    util.setup_logging(verbosity=args.verbose)
 
     with client_factory(curve=args.ecdsa_curve_name) as conn:
         label = args.identity
@@ -161,7 +152,7 @@ def run_agent(client_factory=client.Client):
 def run_git(client_factory=client.Client):
     """Run git under ssh-agent using given hardware client factory."""
     args = create_git_parser().parse_args()
-    setup_logging(verbosity=args.verbose)
+    util.setup_logging(verbosity=args.verbose)
 
     with client_factory(curve=args.ecdsa_curve_name) as conn:
         label = git_host(args.remote, ['pushurl', 'url'])

trezor_agent/gpg/__main__.py

@@ -9,7 +9,7 @@ import time
 import semver
 
 from . import agent, device, encode, keyring, protocol
-from .. import formats, server
+from .. import formats, server, util
 
 log = logging.getLogger(__name__)
 
@@ -75,7 +75,7 @@ def run_agent(args):  # pylint: disable=unused-argument
 def main():
     """Main function."""
     p = argparse.ArgumentParser()
-    p.add_argument('-v', '--verbose', action='store_true', default=False)
+    p.add_argument('-v', '--verbose', default=0, action='count')
     subparsers = p.add_subparsers()
     subparsers.required = True
     subparsers.dest = 'command'
@@ -91,9 +91,7 @@ def main():
     agent_cmd.set_defaults(run=run_agent)
 
     args = p.parse_args()
-    logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO,
-                        format='%(asctime)s %(levelname)-10s %(message)-120s '
-                               '[%(filename)s:%(lineno)d]')
+    util.setup_logging(verbosity=args.verbose)
     log.warning('This GPG tool is still in EXPERIMENTAL mode, '
                 'so please note that the API and features may '
                 'change without backwards compatibility!')

trezor_agent/util.py

@@ -227,3 +227,12 @@ def get_bip32_address(identity, ecdh=False):
     addr_0 = [13, 17][bool(ecdh)]
     address_n = [addr_0] + list(recv(s, '<LLLL'))
     return [(hardened | value) for value in address_n]
+
+
+def setup_logging(verbosity):
+    """Configure logging for this tool."""
+    fmt = ('%(asctime)s %(levelname)-12s %(message)-100s '
+           '[%(filename)s:%(lineno)d]')
+    levels = [logging.WARNING, logging.INFO, logging.DEBUG]
+    level = levels[min(verbosity, len(levels) - 1)]
+    logging.basicConfig(format=fmt, level=level)