commit ad38a8f8cfccd42df63189ebffe2df2196055433 Author: Damian Johnson atagar@torproject.org Date: Sun Nov 13 12:32:55 2016 -0800

Better differentiate logs for this tor instance

Tor slightly changed the wording of the first log line it generates, breaking our ability to narrow logs we prepopulate to just this instance. --- nyx/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyx/log.py b/nyx/log.py index 6e9eb83..aa458a2 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -551,7 +551,7 @@ def read_tor_log(path, read_limit = None): count += 1 yield LogEntry(timestamp, runlevel, msg)

- if 'opening log file' in msg: + if 'opening log file' in msg or 'opening new log file' in msg: break # this entry marks the start of this tor instance

info('panel.log.read_from_log_file', count = count, path = path, read_limit = read_limit if read_limit else 'none', runtime = '%0.3f' % (time.time() - start_time))