Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
polkadot-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
parity
Mirrored projects
polkadot-sdk
Commits
6fe17000
Commit
6fe17000
authored
4 years ago
by
André Silva
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
client: fix log filters (#7241)
* client: fix multiple logger filters * client: add test for log filters setup
parent
2520ba3d
Branches
Branches containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
substrate/client/cli/src/lib.rs
+54
-3
54 additions, 3 deletions
substrate/client/cli/src/lib.rs
with
54 additions
and
3 deletions
substrate/client/cli/src/lib.rs
+
54
−
3
View file @
6fe17000
...
...
@@ -43,7 +43,7 @@ use structopt::{
clap
::{
self
,
AppSettings
},
StructOpt
,
};
use
tracing_subscriber
::
layer
::
SubscriberExt
;
use
tracing_subscriber
::
{
filter
::
Directive
,
layer
::
SubscriberExt
}
;
/// Substrate client CLI
///
...
...
@@ -234,6 +234,13 @@ pub fn init_logger(
tracing_receiver
:
sc_tracing
::
TracingReceiver
,
tracing_targets
:
Option
<
String
>
,
)
->
std
::
result
::
Result
<
(),
String
>
{
fn
parse_directives
(
dirs
:
impl
AsRef
<
str
>
)
->
Vec
<
Directive
>
{
dirs
.as_ref
()
.split
(
','
)
.filter_map
(|
s
|
s
.parse
()
.ok
())
.collect
()
}
if
let
Err
(
e
)
=
tracing_log
::
LogTracer
::
init
()
{
return
Err
(
format!
(
"Registering Substrate logger failed: {:}!"
,
e
...
...
@@ -257,7 +264,7 @@ pub fn init_logger(
if
lvl
!=
""
{
// We're not sure if log or tracing is available at this moment, so silently ignore the
// parse error.
if
let
Ok
(
directive
)
=
lvl
.parse
(
)
{
for
directive
in
parse_directives
(
lvl
)
{
env_filter
=
env_filter
.add_directive
(
directive
);
}
}
...
...
@@ -266,7 +273,7 @@ pub fn init_logger(
if
pattern
!=
""
{
// We're not sure if log or tracing is available at this moment, so silently ignore the
// parse error.
if
let
Ok
(
directive
)
=
pattern
.parse
(
)
{
for
directive
in
parse_
directive
s
(
pattern
)
{
env_filter
=
env_filter
.add_directive
(
directive
);
}
}
...
...
@@ -299,3 +306,47 @@ pub fn init_logger(
}
Ok
(())
}
#[cfg(test)]
mod
tests
{
use
super
::
*
;
use
tracing
::{
metadata
::
Kind
,
subscriber
::
Interest
,
Callsite
,
Level
,
Metadata
};
#[test]
fn
test_logger_filters
()
{
let
test_pattern
=
"afg=debug,sync=trace,client=warn,telemetry"
;
init_logger
(
&
test_pattern
,
Default
::
default
(),
Default
::
default
())
.unwrap
();
tracing
::
dispatcher
::
get_default
(|
dispatcher
|
{
let
test_filter
=
|
target
,
level
|
{
struct
DummyCallSite
;
impl
Callsite
for
DummyCallSite
{
fn
set_interest
(
&
self
,
_
:
Interest
)
{}
fn
metadata
(
&
self
)
->
&
Metadata
<
'_
>
{
unreachable!
();
}
}
let
metadata
=
tracing
::
metadata!
(
name
:
""
,
target
:
target
,
level
:
level
,
fields
:
&
[],
callsite
:
&
DummyCallSite
,
kind
:
Kind
::
SPAN
,
);
dispatcher
.enabled
(
&
metadata
)
};
assert!
(
test_filter
(
"afg"
,
Level
::
INFO
));
assert!
(
test_filter
(
"afg"
,
Level
::
DEBUG
));
assert!
(
!
test_filter
(
"afg"
,
Level
::
TRACE
));
assert!
(
test_filter
(
"sync"
,
Level
::
TRACE
));
assert!
(
test_filter
(
"client"
,
Level
::
WARN
));
assert!
(
test_filter
(
"telemetry"
,
Level
::
TRACE
));
});
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment