extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 14:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix std log (#12470)

Browse Source 
related to
- https://github.com/nushell/nushell/pull/12196

# Description
while i'm 100% okey with the original intent behind
https://github.com/nushell/nushell/pull/12196, i think the PR did
introduce two unintended things:
- extra parentheses that make the `log.nu` module look like Lisp lol
- a renaming of the `NU_LOG_LEVEL` environment variable to
`NU_log-level`. this breaks previous usage of `std log` and, as it's not
mentionned at all in the PR, i thought it was not intentional 😋

# User-Facing Changes
users can now control `std log` with `$env.NU_LOG_LEVEL`

# Tests + Formatting
the "log" tests have been fixed as well.

# After Submitting
This commit is contained in:
Antoine Stevan
2024-04-10 23:30:58 +02:00
committed by GitHub
parent 83674909f1
commit 39156930f5
5 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,34 +44,34 @@ def log-types [] {
(
{
"CRITICAL": {
"ansi": ((log-ansi).CRITICAL),
"level": ((log-level).CRITICAL),
"prefix": ((log-prefix).CRITICAL),
"short_prefix": ((log-short-prefix).CRITICAL)
"ansi": (log-ansi).CRITICAL,
"level": (log-level).CRITICAL,
"prefix": (log-prefix).CRITICAL,
"short_prefix": (log-short-prefix).CRITICAL
},
"ERROR": {
"ansi": ((log-ansi).ERROR),
"level": ((log-level).ERROR),
"prefix": ((log-prefix).ERROR),
"short_prefix": ((log-short-prefix).ERROR)
"ansi": (log-ansi).ERROR,
"level": (log-level).ERROR,
"prefix": (log-prefix).ERROR,
"short_prefix": (log-short-prefix).ERROR
},
"WARNING": {
"ansi": ((log-ansi).WARNING),
"level": ((log-level).WARNING),
"prefix": ((log-prefix).WARNING),
"short_prefix": ((log-short-prefix).WARNING)
"ansi": (log-ansi).WARNING,
"level": (log-level).WARNING,
"prefix": (log-prefix).WARNING,
"short_prefix": (log-short-prefix).WARNING
},
"INFO": {
"ansi": ((log-ansi).INFO),
"level": ((log-level).INFO),
"prefix": ((log-prefix).INFO),
"short_prefix": ((log-short-prefix).INFO)
"ansi": (log-ansi).INFO,
"level": (log-level).INFO,
"prefix": (log-prefix).INFO,
"short_prefix": (log-short-prefix).INFO
},
"DEBUG": {
"ansi": ((log-ansi).DEBUG),
"level": ((log-level).DEBUG),
"prefix": ((log-prefix).DEBUG),
"short_prefix": ((log-short-prefix).DEBUG)
"ansi": (log-ansi).DEBUG,
"level": (log-level).DEBUG,
"prefix": (log-prefix).DEBUG,
"short_prefix": (log-short-prefix).DEBUG
}
}
)
@ -83,16 +83,16 @@ def parse-string-level [
] {
let level = ($level | str upcase)
if $level in [((log-prefix).CRITICAL) ((log-short-prefix).CRITICAL) "CRIT" "CRITICAL"] {
((log-level).CRITICAL)
} else if $level in [((log-prefix).ERROR) ((log-short-prefix).ERROR) "ERROR"] {
((log-level).ERROR)
} else if $level in [((log-prefix).WARNING) ((log-short-prefix).WARNING) "WARN" "WARNING"] {
((log-level).WARNING)
} else if $level in [((log-prefix).DEBUG) ((log-short-prefix).DEBUG) "DEBUG"] {
((log-level).DEBUG)
if $level in [(log-prefix).CRITICAL (log-short-prefix).CRITICAL "CRIT" "CRITICAL"] {
(log-level).CRITICAL
} else if $level in [(log-prefix).ERROR (log-short-prefix).ERROR "ERROR"] {
(log-level).ERROR
} else if $level in [(log-prefix).WARNING (log-short-prefix).WARNING "WARN" "WARNING"] {
(log-level).WARNING
} else if $level in [(log-prefix).DEBUG (log-short-prefix).DEBUG "DEBUG"] {
(log-level).DEBUG
} else {
((log-level).INFO)
(log-level).INFO
}
}
@ -101,41 +101,41 @@ def parse-int-level [
level: int,
--short (-s)
] {
if $level >= ((log-level).CRITICAL) {
if $level >= (log-level).CRITICAL {
if $short {
((log-short-prefix).CRITICAL)
(log-short-prefix).CRITICAL
} else {
((log-prefix).CRITICAL)
(log-prefix).CRITICAL
}
} else if $level >= ((log-level).ERROR) {
} else if $level >= (log-level).ERROR {
if $short {
((log-short-prefix).ERROR)
(log-short-prefix).ERROR
} else {
((log-prefix).ERROR)
(log-prefix).ERROR
}
} else if $level >= ((log-level).WARNING) {
} else if $level >= (log-level).WARNING {
if $short {
((log-short-prefix).WARNING)
(log-short-prefix).WARNING
} else {
((log-prefix).WARNING)
(log-prefix).WARNING
}
} else if $level >= ((log-level).INFO) {
} else if $level >= (log-level).INFO {
if $short {
((log-short-prefix).INFO)
(log-short-prefix).INFO
} else {
((log-prefix).INFO)
(log-prefix).INFO
}
} else {
if $short {
((log-short-prefix).DEBUG)
(log-short-prefix).DEBUG
} else {
((log-prefix).DEBUG)
(log-prefix).DEBUG
}
}
}
def current-log-level [] {
let env_level = ($env.NU_log-level? | default (((log-level).INFO)))
let env_level = ($env.NU_LOG_LEVEL? | default (log-level).INFO)
try {
$env_level | into int
@ -264,11 +264,11 @@ export def custom [
}
let valid_levels_for_defaulting = [
((log-level).CRITICAL)
((log-level).ERROR)
((log-level).WARNING)
((log-level).INFO)
((log-level).DEBUG)
(log-level).CRITICAL
(log-level).ERROR
(log-level).WARNING
(log-level).INFO
(log-level).DEBUG
]
let prefix = if ($level_prefix | is-empty) {