Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log level fix #1486

Merged
merged 1 commit into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion iroha_logger/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ pub fn init(configuration: config::LoggerConfiguration) -> Option<Receiver<Telem
{
return None;
}

let level = configuration.max_log_level.into();
let subscriber_builder = tracing_subscriber::fmt().with_test_writer();
let subscriber_builder = tracing_subscriber::fmt()
.with_test_writer()
.with_max_level(tracing_subscriber::filter::LevelFilter::TRACE);
i1i1 marked this conversation as resolved.
Show resolved Hide resolved

if configuration.compact_mode {
let subscriber = subscriber_builder.compact().finish();
let (subscriber, receiver) = TelemetryLayer::from_capacity(
i1i1 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
63 changes: 63 additions & 0 deletions iroha_logger/tests/log_level.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#![allow(clippy::restriction, clippy::all)]

use std::time::Duration;

use iroha_logger::{
debug, info,
layer::{EventInspectorTrait, EventSubscriber, LevelFilter},
trace,
};
use tokio::{sync::mpsc, time};
use tracing::{Event, Level, Subscriber};

struct SenderFilter<S> {
sender: mpsc::UnboundedSender<()>,
sub: S,
}

impl<S: Subscriber> SenderFilter<S> {
pub fn new(sub: S) -> (impl Subscriber, mpsc::UnboundedReceiver<()>) {
let (sender, receiver) = mpsc::unbounded_channel();
(EventSubscriber(Self { sender, sub }), receiver)
}
}

impl<S: Subscriber> EventInspectorTrait for SenderFilter<S> {
type Subscriber = S;

fn inner_subscriber(&self) -> &Self::Subscriber {
&self.sub
}

fn event(&self, event: &Event<'_>) {
self.sender.send(()).unwrap();
self.sub.event(event)
}
}

#[tokio::test]
async fn test() {
let (sub, mut rcv) = SenderFilter::new(
tracing_subscriber::fmt()
.with_max_level(tracing_subscriber::filter::LevelFilter::TRACE)
.finish(),
);
let sub = LevelFilter::new(Level::DEBUG, sub);
tracing::subscriber::set_global_default(sub).unwrap();

trace!(a = 2, c = true);
debug!(a = 2, c = true);
info!(a = 2, c = true);

time::timeout(Duration::from_millis(10), rcv.recv())
.await
.unwrap()
.unwrap();
time::timeout(Duration::from_millis(10), rcv.recv())
.await
.unwrap()
.unwrap();
assert!(time::timeout(Duration::from_millis(10), rcv.recv())
.await
.is_err());
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::cell::{Cell, RefCell};
use std::rc::Rc;
use std::sync::{Arc, Mutex, RwLock};
use std::{
cell::{Cell, RefCell},
rc::Rc,
sync::{Arc, Mutex, RwLock},
};

struct Variant1;
struct Variant2;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
error[E0119]: conflicting implementations of trait `std::convert::From<Variant1>` for type `Enum`
--> $DIR/03-container-enums.rs:14:10
--> $DIR/03-container-enums.rs:16:10
|
14 | #[derive(iroha_derive::FromVariant)]
16 | #[derive(iroha_derive::FromVariant)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Enum`
|
::: $WORKSPACE/iroha_macro/iroha_derive/tests/from_variant/04-container-from.rs
Expand Down