[tor-commits] [nyx/master] Updated logged_events and startup.events

[atagar at torproject.org]

commit 3bfd5aff2773944f064e2595a432f88d3e008f82
Author: Sambuddha Basu <sambuddhabasu1 at gmail.com>
Date:   Mon Jun 6 21:48:55 2016 -0700

    Updated logged_events and startup.events
    Updated unrecognized_log_flags message
---
 nyx/arguments.py         | 4 ++--
 nyx/panel/log.py         | 2 +-
 nyx/settings/strings.cfg | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nyx/arguments.py b/nyx/arguments.py
index 6627eb1..633c55d 100644
--- a/nyx/arguments.py
+++ b/nyx/arguments.py
@@ -24,7 +24,7 @@ DEFAULT_ARGS = {
   'user_provided_socket': False,
   'config': os.path.join(DATA_DIR, 'nyxrc'),
   'debug_path': None,
-  'logged_events': 'NOTICE,NYX_NOTICE',
+  'logged_events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR',
   'print_version': False,
   'print_help': False,
 }
@@ -137,7 +137,7 @@ def parse(argv):
       try:
         validate_events(arg)
       except ValueError as exc:
-        raise ValueError(msg('usage.unrecognized_log_flags', flags = exc))
+        raise ValueError(msg('usage.unrecognized_log_events', events = exc))
 
       args['logged_events'] = arg
     elif opt in ('-v', '--version'):
diff --git a/nyx/panel/log.py b/nyx/panel/log.py
index 9c2eb68..6cf11c7 100644
--- a/nyx/panel/log.py
+++ b/nyx/panel/log.py
@@ -39,7 +39,7 @@ CONFIG = conf.config_dict('nyx', {
   'features.log.prepopulate': True,
   'features.log.prepopulateReadLimit': 5000,
   'features.log.regex': [],
-  'startup.events': 'NOTICE,NYX_NOTICE',
+  'startup.events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR',
 }, conf_handler)
 
 UPDATE_RATE = 0.3
diff --git a/nyx/settings/strings.cfg b/nyx/settings/strings.cfg
index f669e43..e182b96 100644
--- a/nyx/settings/strings.cfg
+++ b/nyx/settings/strings.cfg
@@ -49,7 +49,7 @@ msg.tracker.unable_to_use_resolver Unable to query connections with {old_resolve
 msg.usage.invalid_arguments {error} (for usage provide --help)
 msg.usage.not_a_valid_address '{address_input}' isn't a valid IPv4 address
 msg.usage.not_a_valid_port '{port_input}' isn't a valid port number
-msg.usage.unrecognized_log_flags Unrecognized event flags: {flags}
+msg.usage.unrecognized_log_events Unrecognized events: {events}
 msg.usage.unable_to_set_color_override "{color}" isn't a valid color
 
 msg.debug.header