-
Notifications
You must be signed in to change notification settings - Fork 990
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix: add logs page to TUI * chore: print panic traces to TUI logs * chore: stop and start tui nicely and a bit of refactoring * chore: rustfmt * chore: typo * chore: use sync_channel for logs * chore: don't try to unwrap err on try_send log message * chore: fix compiler/lint warnings * fix: Only create logs channel if TUI is enabled and resovle other small review comments * fix: wrap logs in TUI to fix window size * fix: debug and trace logs appear white in the TUI logs
- Loading branch information
1 parent
38e6497
commit 8ce2bfd
Showing
15 changed files
with
313 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Copyright 2019 The Grin Developers | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use cursive::theme::{BaseColor, Color, ColorStyle}; | ||
| use cursive::traits::Identifiable; | ||
| use cursive::view::View; | ||
| use cursive::views::BoxView; | ||
| use cursive::{Cursive, Printer}; | ||
|
|
||
| use crate::tui::constants::VIEW_LOGS; | ||
| use cursive::utils::lines::spans::{LinesIterator, Row}; | ||
| use cursive::utils::markup::StyledString; | ||
| use grin_util::logger::LogEntry; | ||
| use log::Level; | ||
| use std::collections::VecDeque; | ||
|
|
||
| pub struct TUILogsView; | ||
|
|
||
| impl TUILogsView { | ||
| pub fn create() -> Box<dyn View> { | ||
| let logs_view = BoxView::with_full_screen(LogBufferView::new(200).with_id("logs")); | ||
| Box::new(logs_view.with_id(VIEW_LOGS)) | ||
| } | ||
|
|
||
| pub fn update(c: &mut Cursive, entry: LogEntry) { | ||
| c.call_on_id("logs", |t: &mut LogBufferView| { | ||
| t.update(entry); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| struct LogBufferView { | ||
| buffer: VecDeque<LogEntry>, | ||
| } | ||
|
|
||
| impl LogBufferView { | ||
| fn new(size: usize) -> Self { | ||
| let mut buffer = VecDeque::new(); | ||
| buffer.resize( | ||
| size, | ||
| LogEntry { | ||
| log: String::new(), | ||
| level: Level::Info, | ||
| }, | ||
| ); | ||
|
|
||
| LogBufferView { buffer } | ||
| } | ||
|
|
||
| fn update(&mut self, entry: LogEntry) { | ||
| self.buffer.push_front(entry); | ||
| self.buffer.pop_back(); | ||
| } | ||
|
|
||
| fn color(level: Level) -> ColorStyle { | ||
| match level { | ||
| Level::Info => ColorStyle::new( | ||
| Color::Light(BaseColor::Green), | ||
| Color::Dark(BaseColor::Black), | ||
| ), | ||
| Level::Warn => ColorStyle::new( | ||
| Color::Light(BaseColor::Yellow), | ||
| Color::Dark(BaseColor::Black), | ||
| ), | ||
| Level::Error => { | ||
| ColorStyle::new(Color::Light(BaseColor::Red), Color::Dark(BaseColor::Black)) | ||
| } | ||
| _ => ColorStyle::new( | ||
| Color::Light(BaseColor::White), | ||
| Color::Dark(BaseColor::Black), | ||
| ), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl View for LogBufferView { | ||
| fn draw(&self, printer: &Printer) { | ||
| let mut i = 0; | ||
| for entry in self.buffer.iter().take(printer.size.y) { | ||
| printer.with_color(LogBufferView::color(entry.level), |p| { | ||
| let log_message = StyledString::plain(&entry.log); | ||
| let mut rows: Vec<Row> = LinesIterator::new(&log_message, printer.size.x).collect(); | ||
| rows.reverse(); // So stack traces are in the right order. | ||
| for row in rows { | ||
| for span in row.resolve(&log_message) { | ||
| p.print((0, p.size.y - 1 - i), span.content); | ||
| i += 1; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.