neolog: new option to hide the node column

neo/scripts/neolog.py

@@ -29,10 +29,11 @@ class Log(object):
     _protocol_date = None
 
     def __init__(self, db_path, decode_all=False, date_format=None,
-                                filter_from=None, node_list=None):
+                       filter_from=None, node_column=True, node_list=None):
         self._date_format = '%F %T' if date_format is None else date_format
         self._decode_all = decode_all
         self._filter_from = filter_from
+        self._node_column = node_column
         self._node_list = node_list
         name = os.path.basename(db_path)
         try:
@@ -109,7 +110,8 @@ class Log(object):
             d = int(date)
             prefix = '%s.%04u ' % (time.strftime(prefix, time.localtime(d)),
                                    int((date - d) * 10000))
-        prefix += '%-9s %-10s ' % (levelname, name)
+        prefix += ('%-9s %-10s ' % (levelname, name) if self._node_column else
+                   '%-9s ' % levelname)
         for msg in msg_list:
             print prefix + msg
 
@@ -189,7 +191,8 @@ def main():
               ' seconds (see -s)', metavar='PID')
     parser.add_option('-n', '--node', action="append",
         help='only show log entries from the given node'
-             ' (only useful for logs produced by threaded tests)')
+             ' (only useful for logs produced by threaded tests),'
+             " special value '-' hides the column")
     parser.add_option('-s', '--sleep-interval', type="float", default=1,
         help='with -f, sleep for approximately N seconds (default 1.0)'
               ' between iterations', metavar='N')
@@ -204,8 +207,14 @@ def main():
     filter_from = options.filter_from
     if filter_from and filter_from < 0:
         filter_from += time.time()
+    node_list = options.node or []
+    try:
+        node_list.remove('-')
+        node_column = False
+    except ValueError:
+        node_column = True
     log_list = [Log(db_path, options.all, options.date, filter_from,
-                    options.node)
+                    node_column, node_list)
                 for db_path in args]
     if options.follow:
         try: