Skip to content
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
45 changes: 38 additions & 7 deletions src/__private_api.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! WARNING: this is not part of the crate's public API and is subject to change at any time

use self::sealed::KVs;
use crate::{Level, Metadata, Record};
use crate::{logger, Level, Log, Metadata, Record};
use std::fmt::Arguments;
use std::panic::Location;
pub use std::{format_args, module_path, stringify};
Expand Down Expand Up @@ -34,7 +34,30 @@ impl<'a> KVs<'a> for () {

// Log implementation.

fn log_impl(
/// The global logger proxy.
///
/// This zero-sized type implements the [`Log`] trait by forwarding calls
/// to the logger registered with the `set_boxed_logger` or `set_logger`
/// methods if there is one, or a nop logger as default.
#[derive(Copy, Clone, Default, Debug)]
pub struct GlobalLogger;

impl Log for GlobalLogger {
fn enabled(&self, metadata: &Metadata) -> bool {
logger().enabled(metadata)
}

fn log(&self, record: &Record) {
logger().log(record)
}

fn flush(&self) {
logger().flush()
}
}

fn log_impl<L: Log>(
logger: L,
args: Arguments,
level: Level,
&(target, module_path, loc): &(&str, &'static str, &'static Location),
Expand All @@ -58,22 +81,30 @@ fn log_impl(
#[cfg(feature = "kv")]
builder.key_values(&kvs);

crate::logger().log(&builder.build());
logger.log(&builder.build());
}

pub fn log<'a, K>(
pub fn log<'a, K, L>(
logger: &L,
Comment thread
tisonkun marked this conversation as resolved.
args: Arguments,
level: Level,
target_module_path_and_loc: &(&str, &'static str, &'static Location),
kvs: K,
) where
K: KVs<'a>,
L: Log,
{
log_impl(args, level, target_module_path_and_loc, kvs.into_kvs())
log_impl(
logger,
args,
level,
target_module_path_and_loc,
kvs.into_kvs(),
)
}

pub fn enabled(level: Level, target: &str) -> bool {
crate::logger().enabled(&Metadata::builder().level(level).target(target).build())
pub fn enabled<L: Log>(logger: L, level: Level, target: &str) -> bool {
logger.enabled(&Metadata::builder().level(level).target(target).build())
}

#[track_caller]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ pub trait Log: Sync + Send {
fn flush(&self);
}

// Just used as a dummy initial value for LOGGER
/// A dummy initial value for LOGGER.
struct NopLogger;

impl Log for NopLogger {
Expand Down
Loading