commit a4f23e4c50f739412278798b63c721995bc07f40 Author: Damian Johnson atagar@torproject.org Date: Tue Jun 7 09:18:05 2016 -0700
Merge msg.misc.event_types into help message
We kept this separate because the old event selection dialog used it. Now that is no longer the case we can merge this into the message. Also dropping the 'defaults to ...' part since enumerating all those is an eye sore. This value has a clear enough default since it's shown right away when they start up.
I'm tempted to remove the events from the help message since they're dynamic and the list we show won't be accurate with new tor releases, but keeping for the moment. --- nyx/arguments.py | 2 -- nyx/popups.py | 6 +----- nyx/settings/strings.cfg | 23 ++++++++++------------- 3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/nyx/arguments.py b/nyx/arguments.py index d12b885..0515cea 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -164,8 +164,6 @@ def get_help(): port = DEFAULT_ARGS['control_port'], socket = DEFAULT_ARGS['control_socket'], config_path = DEFAULT_ARGS['config'], - default_events = DEFAULT_ARGS['logged_events'], - events = msg('misc.event_types'), )
diff --git a/nyx/popups.py b/nyx/popups.py index b21259b..5bfb2f8 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -33,7 +33,7 @@ import nyx.panel
from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, NORMAL, BOLD, HIGHLIGHT
-import stem.util.conf +import stem.util.str_tools
NO_STATS_MSG = "Usage stats aren't available yet, press any key..."
@@ -46,10 +46,6 @@ BLOCK_START, BLOCK_END = '-----BEGIN ', '-----END ' UNRESOLVED_MSG = 'No consensus data available' ERROR_MSG = 'Unable to retrieve data'
-CONFIG = stem.util.conf.config_dict('nyx', { - 'msg.misc.event_types': '', -}) -
def show_help(): """ diff --git a/nyx/settings/strings.cfg b/nyx/settings/strings.cfg index b5e05a4..51dbfde 100644 --- a/nyx/settings/strings.cfg +++ b/nyx/settings/strings.cfg @@ -62,17 +62,6 @@ msg.debug.header |{nyxrc_content} |--------------------------------------------------------------------------------
-msg.misc.event_types -| DEBUG INFO NOTICE WARN ERR -| NYX_DEBUG NYX_INFO NYX_NOTICE NYX_WARNING NYX_ERROR -| -| ADDRMAP AUTHDIR_NEWDESCS BUILDTIMEOUT_SET BW CELL_STATS -| CIRC CIRC_BW CIRC_MINOR CONF_CHANGED CONN_BW -| CLIENTS_SEEN DESCCHANGED GUARD HS_DESC HS_DESC_CONTENT -| NETWORK_LIVENESS NEWCONSENSUS NEWDESC NS ORCONN -| SIGNAL STREAM_BW STATUS_CLIENT STATUS_GENERAL STATUS_SERVER -| STREAM TB_EMPTY TRANSPORT_LAUNCHED - msg.setup.unknown_term |Unknown $TERM: ({term}) |Either update your terminfo database or run nyx using "TERM=xterm nyx". @@ -88,9 +77,17 @@ msg.usage.help_output | -c, --config CONFIG_PATH loaded configuration options, CONFIG_PATH | defaults to: {config_path} | -d, --debug LOG_PATH writes all nyx logs to the given location -| -l, --log EVENTS event types to be logged (default: {default_events}) +| -l, --log EVENTS comma separated list of events to log | -|{events} +| DEBUG INFO NOTICE WARN ERR +| NYX_DEBUG NYX_INFO NYX_NOTICE NYX_WARNING NYX_ERROR +| +| ADDRMAP AUTHDIR_NEWDESCS BUILDTIMEOUT_SET BW CELL_STATS +| CIRC CIRC_BW CIRC_MINOR CONF_CHANGED CONN_BW +| CLIENTS_SEEN DESCCHANGED GUARD HS_DESC HS_DESC_CONTENT +| NETWORK_LIVENESS NEWCONSENSUS NEWDESC NS ORCONN +| SIGNAL STREAM_BW STATUS_CLIENT STATUS_GENERAL STATUS_SERVER +| STREAM TB_EMPTY TRANSPORT_LAUNCHED | | -v, --version provides version information | -h, --help presents this help