extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-16 01:08:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Respect user-defined $env.NU_LOG_FORMAT and $env.NU_LOG_DATE_FORMAT (#13692)

Browse Source 
Fixes nushell/nushell#13689

# Description

Respect user-defined `$env.NU_LOG_FORMAT` and `$env.NU_LOG_DATE_FORMAT`

Additionally I fixed `nu_with_std!()` macro (it was not working
correctly)

# User-Facing Changes

Users now may set `$env.NU_LOG_FORMAT` and `$env.NU_LOG_DATE_FORMAT` in
`env.nu` and it will work even if `use std` is used after that.

# Tests + Formatting

Added a couple of tests for the new functionality.

# After Submitting
This commit is contained in:
Bruce Weirdan 2024-08-28 14:57:43 +02:00 committed by GitHub
parent a39e94de8a
commit 4f822e263f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-std/std/log.nu
View File

@ -36,8 +36,8 @@ export def log-short-prefix [] {
} }
} }
export-env { export-env {
$env.NU_LOG_FORMAT = $"%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%" $env.NU_LOG_FORMAT = $env.NU_LOG_FORMAT? | default "%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
$env.NU_LOG_DATE_FORMAT = "%Y-%m-%dT%H:%M:%S%.3f" $env.NU_LOG_DATE_FORMAT = $env.NU_LOG_DATE_FORMAT? | default "%Y-%m-%dT%H:%M:%S%.3f"
} }
def log-types [] { def log-types [] {

12
crates/nu-test-support/src/macros.rs
View File

@ -143,7 +143,7 @@ macro_rules! nu_with_std {
cwd: $value:expr, cwd: $value:expr,
$($rest:tt)* $($rest:tt)*
) => { ) => {
nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*) nu_with_std!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
}; };
// For all other options, we call `.into()` on the `$value` and hope for the best. ;) // For all other options, we call `.into()` on the `$value` and hope for the best. ;)
( (
@ -151,7 +151,7 @@ macro_rules! nu_with_std {
$field:ident : $value:expr, $field:ident : $value:expr,
$($rest:tt)* $($rest:tt)*
) => { ) => {
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*) nu_with_std!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
}; };
// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any // When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
@ -163,11 +163,11 @@ macro_rules! nu_with_std {
$(,)* $(,)*
) => {{ ) => {{
// Here we parse the options into a `NuOpts` struct // Here we parse the options into a `NuOpts` struct
let opts = nu!(@nu_opts $($options)*); let opts = nu_with_std!(@nu_opts $($options)*);
// and format the `$path` using the `$part`s // and format the `$path` using the `$part`s
let path = nu!(@format_path $path, $($part),*); let path = nu_with_std!(@format_path $path, $($part),*);
// Then finally we go to the `@main` phase, where the actual work is done. // Then finally we go to the `@main` phase, where the actual work is done.
nu!(@main opts, path) nu_with_std!(@main opts, path)
}}; }};
// Create the NuOpts struct from the `field => value ;` pairs // Create the NuOpts struct from the `field => value ;` pairs
@ -196,7 +196,7 @@ macro_rules! nu_with_std {
// This is the entrypoint for this macro. // This is the entrypoint for this macro.
($($token:tt)*) => {{ ($($token:tt)*) => {{
nu!(@options [ ] $($token)*) nu_with_std!(@options [ ] $($token)*)
}}; }};
} }

32
tests/shell/environment/env.rs
View File

@ -2,7 +2,7 @@ use super::support::Trusted;
use nu_test_support::fs::Stub::FileWithContent; use nu_test_support::fs::Stub::FileWithContent;
use nu_test_support::playground::Playground; use nu_test_support::playground::Playground;
use nu_test_support::{nu, nu_repl_code}; use nu_test_support::{nu, nu_repl_code, nu_with_std};
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use serial_test::serial; use serial_test::serial;
@ -215,3 +215,33 @@ fn env_var_case_insensitive() {
assert!(actual.out.contains("111")); assert!(actual.out.contains("111"));
assert!(actual.out.contains("222")); assert!(actual.out.contains("222"));
} }
#[test]
fn std_log_env_vars_are_not_overridden() {
let actual = nu_with_std!(
envs: vec![
("NU_LOG_FORMAT".to_string(), "%MSG%".to_string()),
("NU_LOG_DATE_FORMAT".to_string(), "%Y".to_string()),
],
r#"
use std
print -e $env.NU_LOG_FORMAT
print -e $env.NU_LOG_DATE_FORMAT
std log error "err"
"#
);
assert_eq!(actual.err, "%MSG%\n%Y\nerr\n");
}
#[test]
fn std_log_env_vars_have_defaults() {
let actual = nu_with_std!(
r#"
use std
print -e $env.NU_LOG_FORMAT
print -e $env.NU_LOG_DATE_FORMAT
"#
);
assert!(actual.err.contains("%MSG%"));
assert!(actual.err.contains("%Y-"));
}