mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

20211216 tracing cleanup (#627)

Browse source
This commit is contained in:
Firstyear 2021-12-17 13:54:13 +10:00 committed by GitHub
parent ba190d99f8
commit 22682279aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 62 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Cargo.lock generated
View file

@ -1140,19 +1140,6 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "env_logger"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
"humantime",
"log",
"regex",
"termcolor",
]
[[package]]
name = "event-listener"
version = "2.5.1"
@ -1653,12 +1640,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.14.15"
@ -1842,7 +1823,6 @@ dependencies = [
"concread",
"criterion",
"either",
"env_logger",
"fernet",
"filetime",
"futures",
@ -1855,7 +1835,6 @@ dependencies = [
"ldap3_server",
"libc",
"libsqlite3-sys",
"log",
"num_cpus",
"num_enum",
"openssl",
@ -1901,11 +1880,9 @@ dependencies = [
"async-std",
"base64 0.13.0",
"compact_jwt",
"env_logger",
"futures",
"kanidm",
"kanidm_proto",
"log",
"oauth2",
"reqwest",
"serde",
@ -1913,6 +1890,8 @@ dependencies = [
"serde_json",
"tokio",
"toml",
"tracing",
"tracing-subscriber",
"url",
"uuid",
"webauthn-authenticator-rs",
@ -1939,11 +1918,9 @@ version = "1.1.0-alpha.6"
dependencies = [
"bundy",
"dialoguer",
"env_logger",
"kanidm_client",
"kanidm_proto",
"libc",
"log",
"qrcode",
"rayon",
"rpassword",
@ -1952,6 +1929,8 @@ dependencies = [
"shellexpand",
"structopt",
"time 0.2.27",
"tracing",
"tracing-subscriber",
"webauthn-authenticator-rs",
"zxcvbn",
]
@ -1962,14 +1941,12 @@ version = "1.1.0-alpha.6"
dependencies = [
"async-std",
"bytes",
"env_logger",
"futures",
"kanidm",
"kanidm_client",
"kanidm_proto",
"libc",
"libsqlite3-sys",
"log",
"lru",
"r2d2",
"r2d2_sqlite",
@ -1983,6 +1960,8 @@ dependencies = [
"tokio",
"tokio-util",
"toml",
"tracing",
"tracing-subscriber",
"users",
]
@ -2465,13 +2444,11 @@ dependencies = [
"async-std",
"crossbeam",
"csv",
"env_logger",
"futures-util",
"jemallocator",
"kanidm_client",
"kanidm_proto",
"ldap3_server",
"log",
"mathru",
"openssl",
"rand 0.8.4",
@ -2483,6 +2460,8 @@ dependencies = [
"tokio-openssl",
"tokio-util",
"toml",
"tracing",
"tracing-subscriber",
"uuid",
]
@ -3543,15 +3522,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "termcolor"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
[[package]]
name = "terminal_size"
version = "0.1.17"

4
kanidm_client/Cargo.toml
View file

@ -10,7 +10,8 @@ homepage = "https://github.com/kanidm/kanidm/"
repository = "https://github.com/kanidm/kanidm/"
[dependencies]
log = "0.4"
tracing = "0.1"
tracing-subscriber = "0.2"
reqwest = { version = "0.11", features=["cookies", "json", "native-tls"] }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
serde = "1.0"
@ -23,7 +24,6 @@ webauthn-rs = "0.3"
tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] }
[dev-dependencies]
env_logger = "0.9"
tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] }
kanidm = { path = "../kanidmd" }
futures = "0.3"

2
kanidm_client/src/lib.rs
View file

@ -9,7 +9,7 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use serde_derive::Deserialize;
use serde_json::error::Error as SerdeJsonError;

6
kanidm_client/tests/common.rs
View file

@ -26,13 +26,7 @@ fn is_free_port(port: u16) -> bool {
// Test external behaviours of the service.
pub fn run_test(test_fn: fn(KanidmClient) -> ()) {
// ::std::env::set_var("RUST_LOG", "tide=debug,kanidm=debug");
let _ = tracing_tree::test_init();
let _ = env_logger::builder()
.format_timestamp(None)
.format_level(false)
.is_test(true)
.try_init();
let (ready_tx, mut ready_rx) = mpsc::channel(1);
let (finish_tx, mut finish_rx) = mpsc::channel(1);

2
kanidm_client/tests/proto_v1_test.rs
View file

@ -1,7 +1,7 @@
#![deny(warnings)]
use std::time::SystemTime;
use log::debug;
use tracing::debug;
use kanidm::credential::totp::Totp;
use kanidm_client::KanidmClient;

4
kanidm_tools/Cargo.toml
View file

@ -30,11 +30,11 @@ path = "src/badlist_preprocess.rs"
[dependencies]
kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha.4" }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha.4" }
tracing = "0.1"
tracing-subscriber = "0.2"
rpassword = "5.0"
structopt = { version = "0.3", default-features = false }
libc = "0.2"
log = "0.4"
env_logger = "0.9"
serde = "1.0"
serde_json = "1.0"
shellexpand = "2.0"

6
kanidm_tools/src/badlist_preprocess.rs
View file

@ -16,9 +16,9 @@ use std::sync::atomic::{AtomicUsize, Ordering};
use kanidm_proto::v1::Modify;
use log::{debug, error, info};
use rayon::prelude::*;
use structopt::StructOpt;
use tracing::{debug, error, info};
include!("opt/badlist_preprocess.rs");
@ -26,10 +26,8 @@ fn main() {
let opt = BadlistProcOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
if opt.modlist {
debug!("Running in modlist generation mode");

3
kanidm_tools/src/cli/lib.rs
View file

@ -9,7 +9,8 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use std::path::PathBuf;
use structopt::StructOpt;

4
kanidm_tools/src/cli/main.rs
View file

@ -19,10 +19,8 @@ fn main() {
"RUST_LOG",
"kanidm=debug,kanidm_client=debug,webauthn=debug",
);
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info,webauthn=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
opt.exec()
}

6
kanidm_tools/src/ssh_authorizedkeys.rs
View file

@ -12,8 +12,8 @@ use std::path::PathBuf;
use kanidm_client::{ClientError, KanidmClientBuilder};
use log::{debug, error};
use structopt::StructOpt;
use tracing::{debug, error};
include!("opt/ssh_authorizedkeys.rs");
@ -25,10 +25,8 @@ fn main() {
let opt = SshAuthorizedOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
let config_path: String = shellexpand::tilde("~/.config/kanidm").into_owned();
debug!("Attempting to use config {}", "/etc/kanidm/config");

6
kanidm_unix_int/Cargo.toml
View file

@ -45,6 +45,10 @@ path = "src/test_auth.rs"
kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha" }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
kanidm = { path = "../kanidmd", version = "1.1.0-alpha" }
tracing = "0.1"
tracing-subscriber = "0.2"
toml = "0.5"
rpassword = "5.0"
tokio = { version = "1", features = ["rt", "macros", "sync", "time", "net", "io-util"] }
@ -54,8 +58,6 @@ futures = "0.3"
bytes = "1.0"
libc = "0.2"
log = "0.4"
env_logger = "0.9"
serde = "1.0"
serde_derive = "1.0"
serde_cbor = "0.11"

7
kanidm_unix_int/src/cache_clear.rs
View file

@ -9,9 +9,8 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use log::debug;
use structopt::StructOpt;
use futures::executor::block_on;
@ -27,10 +26,8 @@ async fn main() {
let opt = CacheClearOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Starting cache invalidate tool ...");

7
kanidm_unix_int/src/cache_invalidate.rs
View file

@ -9,9 +9,8 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use log::debug;
use structopt::StructOpt;
use futures::executor::block_on;
@ -27,10 +26,8 @@ async fn main() {
let opt = CacheInvalidateOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Starting cache invalidate tool ...");

5
kanidm_unix_int/src/daemon.rs
View file

@ -9,7 +9,7 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use users::{get_current_gid, get_current_uid, get_effective_gid, get_effective_uid};
@ -377,8 +377,7 @@ async fn main() {
std::process::exit(1);
}
// ::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Profile -> {}", env!("KANIDM_PROFILE_NAME"));
debug!("CPU Flags -> {}", env!("KANIDM_CPU_FLAGS"));

7
kanidm_unix_int/src/daemon_status.rs
View file

@ -9,9 +9,8 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use log::debug;
use std::path::PathBuf;
use structopt::StructOpt;
@ -27,10 +26,8 @@ fn main() {
let opt = UnixdStatusOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Starting cache status tool ...");

12
kanidm_unix_int/src/db.rs
View file

@ -705,7 +705,7 @@ mod tests {
#[test]
fn test_cache_db_account_basic() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());
@ -789,7 +789,7 @@ mod tests {
#[test]
fn test_cache_db_group_basic() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());
@ -864,7 +864,7 @@ mod tests {
#[test]
fn test_cache_db_account_group_update() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());
@ -932,7 +932,7 @@ mod tests {
#[test]
fn test_cache_db_account_password() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());
@ -981,7 +981,7 @@ mod tests {
#[test]
fn test_cache_db_group_rename_duplicate() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());
@ -1036,7 +1036,7 @@ mod tests {
#[test]
fn test_cache_db_account_rename_duplicate() {
let _ = env_logger::builder().is_test(true).try_init();
let _ = tracing_subscriber::fmt::try_init();
let db = Db::new("").expect("failed to create.");
let dbtxn = task::block_on(db.write());
assert!(dbtxn.migrate().is_ok());

2
kanidm_unix_int/src/lib.rs
View file

@ -11,7 +11,7 @@
#[macro_use]
extern crate serde_derive;
#[macro_use]
extern crate log;
extern crate tracing;
#[macro_use]
extern crate rusqlite;

7
kanidm_unix_int/src/ssh_authorizedkeys.rs
View file

@ -9,9 +9,8 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use log::debug;
use std::path::PathBuf;
use structopt::StructOpt;
@ -28,10 +27,8 @@ async fn main() {
let opt = SshAuthorizedOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Starting authorized keys tool ...");

4
kanidm_unix_int/src/tasks_daemon.rs
View file

@ -9,7 +9,7 @@
#![deny(clippy::trivially_copy_pass_by_ref)]
#[macro_use]
extern crate log;
extern crate tracing;
use users::{get_effective_gid, get_effective_uid};
@ -210,7 +210,7 @@ async fn main() {
std::process::exit(1);
}
env_logger::init();
tracing_subscriber::fmt::init();
let unixd_path = Path::new("/etc/kanidm/unixd");
let unixd_path_str = match unixd_path.to_str() {

9
kanidm_unix_int/src/test_auth.rs
View file

@ -1,8 +1,7 @@
#![deny(warnings)]
#[macro_use]
extern crate log;
extern crate tracing;
use log::debug;
use structopt::StructOpt;
use futures::executor::block_on;
@ -24,12 +23,10 @@ async fn main() {
let opt = ClientOpt::from_args();
if opt.debug {
::std::env::set_var("RUST_LOG", "kanidm=debug,kanidm_client=debug");
} else {
::std::env::set_var("RUST_LOG", "kanidm=info,kanidm_client=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
debug!("Starting cache invalidate tool ...");
debug!("Starting pam auth tester tool ...");
let cfg = KanidmUnixdConfig::new()
.read_options_from_optional_config("/etc/kanidm/unixd")

2
kanidm_unix_int/tests/cache_layer_test.rs
View file

@ -37,9 +37,7 @@ fn is_free_port(port: u16) -> bool {
}
fn run_test(fix_fn: fn(&KanidmClient) -> (), test_fn: fn(CacheLayer, KanidmAsyncClient) -> ()) {
// ::std::env::set_var("RUST_LOG", "kanidm=debug");
let _ = tracing_tree::test_init();
let _ = env_logger::builder().is_test(true).try_init();
let (ready_tx, mut ready_rx) = mpsc::channel(1);
let (finish_tx, mut finish_rx) = mpsc::channel(1);

10
kanidmd/Cargo.toml
View file

@ -19,6 +19,9 @@ path = "src/server/main.rs"
[dependencies]
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
tracing = { version = "0.1", features = ["attributes"] }
tracing-subscriber = "0.2"
tracing-serde = "0.1"
jemallocator = { version = "0.3.0", optional = true }
either = "1.6"
@ -34,8 +37,6 @@ compact_jwt = "^0.1.7"
async-std = { version = "1.6", features = ["tokio1"] }
log = "0.4"
env_logger = "0.9"
rand = "0.8"
toml = "0.5"
@ -94,10 +95,7 @@ validator = { version = "0.14", features = ["phone"] }
touch = "0.0.1"
filetime = "0.2"
tracing = { version = "0.1", features = ["attributes", "release_max_level_info"] }
tracing-subscriber = "0.2"
tracing-serde = "0.1"
num_enum = "0.5.4"
num_enum = "0.5"
[features]

8
kanidmd/src/lib/filter.rs
View file

@ -1372,13 +1372,7 @@ mod tests {
#[test]
fn test_filter_optimise() {
use env_logger;
::std::env::set_var("RUST_LOG", "actix_web=debug,kanidm=debug");
let _ = env_logger::builder()
.format_timestamp(None)
.format_level(false)
.is_test(true)
.try_init();
let _ = tracing_subscriber::fmt().try_init();
// Given sets of "optimisable" filters, optimise them.
filter_optimise_assert!(
f_and(vec![f_and(vec![f_eq(

6
kanidmd/src/lib/lib.rs
View file

@ -18,14 +18,12 @@
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
#[macro_use]
extern crate log;
#[macro_use]
extern crate serde_derive;
#[macro_use]
extern crate rusqlite;
#[macro_use]
extern crate tracing;
#[macro_use]
extern crate lazy_static;

9
kanidmd/src/server/main.rs
View file

@ -213,11 +213,10 @@ async fn main() {
}
// ::std::env::set_var("RUST_LOG", "tide=info,kanidm=info,webauthn=debug");
env_logger::builder()
.format_timestamp(None)
.format_level(false)
.init();
// env_logger::builder()
// .format_timestamp(None)
// .format_level(false)
// .init();
match opt {
KanidmdOpt::Server(_sopt) => {

4
orca/Cargo.toml
View file

@ -15,6 +15,8 @@ path = "src/main.rs"
[dependencies]
jemallocator = { version = "0.3.0", optional = true }
tracing = "0.1"
tracing-subscriber = "0.2"
structopt = { version = "0.3", default-features = false }
@ -24,8 +26,6 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
serde_derive = "1.0"
log = "0.4"
env_logger = "0.9"
rand = "0.8"
toml = "0.5"

6
orca/src/main.rs
View file

@ -13,7 +13,7 @@
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
#[macro_use]
extern crate log;
extern crate tracing;
#[macro_use]
extern crate serde_derive;
@ -187,10 +187,8 @@ async fn main() {
"RUST_LOG",
"orca=debug,kanidm=debug,kanidm_client=debug,webauthn=debug",
);
} else {
::std::env::set_var("RUST_LOG", "orca=info");
}
env_logger::init();
tracing_subscriber::fmt::init();
info!("Orca - the Kanidm Load Testing Utility.");
debug!("cli -> {:?}", opt);