Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes: Issue #578 - Disable all logging, most terminal echoing via --quiet flag/-Q; --federated-only/-F

pull/637/head
Kieran Prasch 2018-12-20 11:46:37 -08:00
parent 961c17b9ee
commit ca2052fb24
No known key found for this signature in database
GPG Key ID: 199AB839D4125A62
1 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
nucypher/cli/main.py
View File

@ -141,7 +141,8 @@ def status(click_config, config_file):
@click.argument('action') @click.argument('action')
@click.option('--debug', '-D', help="Enable debugging mode", is_flag=True) @click.option('--debug', '-D', help="Enable debugging mode", is_flag=True)
@click.option('--dev', '-d', help="Enable development mode", is_flag=True) @click.option('--dev', '-d', help="Enable development mode", is_flag=True)
@click.option('--dry-run', help="Execute normally without actually starting the node", is_flag=True) @click.option('--quiet', '-Q', help="Disable logging", is_flag=True)
@click.option('--dry-run', '-x', help="Execute normally without actually starting the node", is_flag=True)
@click.option('--force', '-f', help="Don't ask for confirmation", is_flag=True) @click.option('--force', '-f', help="Don't ask for confirmation", is_flag=True)
@click.option('--teacher-uri', help="An Ursula URI to start learning from (seednode)", type=click.STRING) @click.option('--teacher-uri', help="An Ursula URI to start learning from (seednode)", type=click.STRING)
@click.option('--min-stake', help="The minimum stake the teacher must have to be a teacher", type=click.INT, default=0) @click.option('--min-stake', help="The minimum stake the teacher must have to be a teacher", type=click.INT, default=0)
@ -149,7 +150,7 @@ def status(click_config, config_file):
@click.option('--rest-port', help="The host port to run Ursula network services on", type=NETWORK_PORT) @click.option('--rest-port', help="The host port to run Ursula network services on", type=NETWORK_PORT)
@click.option('--db-filepath', help="The database filepath to connect to", type=click.STRING) @click.option('--db-filepath', help="The database filepath to connect to", type=click.STRING)
@click.option('--checksum-address', help="Run with a specified account", type=EIP55_CHECKSUM_ADDRESS) @click.option('--checksum-address', help="Run with a specified account", type=EIP55_CHECKSUM_ADDRESS)
@click.option('--federated-only', help="Connect only to federated nodes", is_flag=True, default=FEDERATED_ONLY) @click.option('--federated-only', '-F', help="Connect only to federated nodes", is_flag=True, default=FEDERATED_ONLY)
@click.option('--poa', help="Inject POA middleware", is_flag=True) @click.option('--poa', help="Inject POA middleware", is_flag=True)
@click.option('--config-root', help="Custom configuration directory", type=click.Path()) @click.option('--config-root', help="Custom configuration directory", type=click.Path())
@click.option('--config-file', help="Path to configuration file", type=EXISTING_READABLE_FILE) @click.option('--config-file', help="Path to configuration file", type=EXISTING_READABLE_FILE)
@ -162,6 +163,7 @@ def ursula(click_config,
action, action,
debug, debug,
dev, dev,
quiet,
dry_run, dry_run,
force, force,
teacher_uri, teacher_uri,
@ -198,23 +200,30 @@ def ursula(click_config,
# #
# Boring Setup Stuff # Boring Setup Stuff
# #
log = Logger('ursula.cli') if not quiet:
log = Logger('ursula.cli')
if debug: if debug and not quiet:
click_config.log_to_sentry = False click_config.log_to_sentry = False
click_config.log_to_file = True click_config.log_to_file = True
globalLogPublisher.removeObserver(logToSentry) # Sentry globalLogPublisher.removeObserver(logToSentry) # Sentry
globalLogPublisher.addObserver(SimpleObserver(log_level_name='debug')) # Print globalLogPublisher.addObserver(SimpleObserver(log_level_name='debug')) # Print
elif quiet:
globalLogPublisher.removeObserver(logToSentry)
globalLogPublisher.removeObserver(SimpleObserver)
globalLogPublisher.removeObserver(getJsonFileObserver())
# #
# Launch Warnings # Launch Warnings
# #
if dev: if not quiet:
click.secho("WARNING: Running in development mode", fg='yellow') if dev:
if federated_only: click.secho("WARNING: Running in development mode", fg='yellow')
click.secho("WARNING: Running in Federated mode", fg='yellow') if federated_only:
if force: click.secho("WARNING: Running in Federated mode", fg='yellow')
click.secho("WARNING: Force is enabled", fg='yellow') if force:
click.secho("WARNING: Force is enabled", fg='yellow')
# #
# Unauthenticated Configurations # Unauthenticated Configurations
@ -222,7 +231,7 @@ def ursula(click_config,
if action == "init": if action == "init":
"""Create a brand-new persistent Ursula""" """Create a brand-new persistent Ursula"""
if dev: if dev and not quiet:
click.secho("WARNING: Using temporary storage area", fg='yellow') click.secho("WARNING: Using temporary storage area", fg='yellow')
if not config_root: # Flag if not config_root: # Flag
@ -243,17 +252,21 @@ def ursula(click_config,
provider_uri=provider_uri, provider_uri=provider_uri,
poa=poa) poa=poa)
click.secho("Generated keyring {}".format(ursula_config.keyring_dir), fg='green') if not quiet:
click.secho("Saved configuration file {}".format(ursula_config.config_file_location), fg='green') click.secho("Generated keyring {}".format(ursula_config.keyring_dir), fg='green')
click.secho("Saved configuration file {}".format(ursula_config.config_file_location), fg='green')
# Give the use a suggestion as to what to do next... # Give the use a suggestion as to what to do next...
how_to_run_message = "\nTo run an Ursula node from the default configuration filepath run: \n\n'{}'\n" how_to_run_message = "\nTo run an Ursula node from the default configuration filepath run: \n\n'{}'\n"
suggested_command = 'nucypher ursula run' suggested_command = 'nucypher ursula run'
if config_root is not None: if config_root is not None:
config_file_location = os.path.join(config_root, config_file or UrsulaConfiguration.CONFIG_FILENAME) config_file_location = os.path.join(config_root, config_file or UrsulaConfiguration.CONFIG_FILENAME)
suggested_command += ' --config-file {}'.format(config_file_location) suggested_command += ' --config-file {}'.format(config_file_location)
click.secho(how_to_run_message.format(suggested_command), fg='green') click.secho(how_to_run_message.format(suggested_command), fg='green')
return # FIN return # FIN
else:
click.secho("OK")
# Development Configuration # Development Configuration
if dev: if dev:
@ -284,7 +297,8 @@ def ursula(click_config,
try: # Unlock Keyring try: # Unlock Keyring
# ursula_config.attach_keyring() # ursula_config.attach_keyring()
click.secho('Decrypting keyring...', fg='blue') if not quiet:
click.secho('Decrypting keyring...', fg='blue')
ursula_config.keyring.unlock(password=click_config.get_password()) # Takes ~3 seconds, ~1GB Ram ursula_config.keyring.unlock(password=click_config.get_password()) # Takes ~3 seconds, ~1GB Ram
except CryptoError: except CryptoError:
raise ursula_config.keyring.AuthenticationFailed raise ursula_config.keyring.AuthenticationFailed
@ -340,9 +354,13 @@ def ursula(click_config,
raise # Crash :-( raise # Crash :-(
finally: finally:
click.secho("Stopping Ursula") if not quiet:
click.secho("Stopping Ursula")
ursula_config.cleanup() ursula_config.cleanup()
click.secho("Ursula Stopped", fg='red') if not quiet:
click.secho("Ursula Stopped", fg='red')
else:
click.secho("Stopped")
return return
elif action == "save-metadata": elif action == "save-metadata":
@ -350,18 +368,17 @@ def ursula(click_config,
ursula = ursula_config.produce(ursula_config=ursula_config) ursula = ursula_config.produce(ursula_config=ursula_config)
metadata_path = ursula.write_node_metadata(node=ursula) metadata_path = ursula.write_node_metadata(node=ursula)
click.secho("Successfully saved node metadata to {}.".format(metadata_path), fg='green') if not quiet:
click.secho("Successfully saved node metadata to {}.".format(metadata_path), fg='green')
return return
elif action == "view": elif action == "view":
"""Paint an existing configuration to the console""" """Paint an existing configuration to the console"""
paint_configuration(config_filepath=config_file or ursula_config.config_file_location) paint_configuration(config_filepath=config_file or ursula_config.config_file_location)
return return
elif action == "forget": elif action == "forget":
"""Forget all known nodes via storages""" """Forget all known nodes via storages"""
click.confirm("Permanently delete all known node data?", abort=True) click.confirm("Permanently delete all known node data?", abort=True)
ursula_config.forget_nodes() ursula_config.forget_nodes()
message = "Removed all stored node node metadata and certificates" message = "Removed all stored node node metadata and certificates"