mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2025-04-10 19:15:12 +00:00
LOGGER: added caller in the log message
This commit is contained in:
parent
9ffb1c2586
commit
80f22e39ac
|
@ -29,10 +29,14 @@ log() {
|
||||||
|
|
||||||
local level="$1" # Logging level of the current message
|
local level="$1" # Logging level of the current message
|
||||||
local message="$2" # Message to log
|
local message="$2" # Message to log
|
||||||
local timestamp="$(date +[%Y-%m-%d\ %H:%M:%S.%3N])" # Timestamp for the log entry
|
|
||||||
local logfile="${3:-$rd_logs_folder/retrodeck.log}" # Log file, default to retrodeck.log
|
local logfile="${3:-$rd_logs_folder/retrodeck.log}" # Log file, default to retrodeck.log
|
||||||
|
local timestamp="$(date +[%Y-%m-%d\ %H:%M:%S.%3N])" # Timestamp for the log entry
|
||||||
local colorize_terminal=true
|
local colorize_terminal=true
|
||||||
|
|
||||||
|
# Determine the calling function or use [FWORK]
|
||||||
|
local caller="${FUNCNAME[1]:-[FWORK]}"
|
||||||
|
caller="${caller^^}" # Convert to uppercase
|
||||||
|
|
||||||
# Check if the shell is sh (not bash or zsh) to avoid colorization
|
# Check if the shell is sh (not bash or zsh) to avoid colorization
|
||||||
if [ "${SHELL##*/}" = "sh" ]; then
|
if [ "${SHELL##*/}" = "sh" ]; then
|
||||||
colorize_terminal=false
|
colorize_terminal=false
|
||||||
|
@ -76,11 +80,11 @@ log() {
|
||||||
|
|
||||||
# Construct the log message
|
# Construct the log message
|
||||||
if [ "$colorize_terminal" = true ]; then
|
if [ "$colorize_terminal" = true ]; then
|
||||||
colored_message="$color $message\e[0m"
|
colored_message="$color [$caller] $message\e[0m"
|
||||||
else
|
else
|
||||||
colored_message="$timestamp $prefix $message"
|
colored_message="$timestamp $prefix [$caller] $message"
|
||||||
fi
|
fi
|
||||||
log_message="$timestamp $prefix $message"
|
log_message="$timestamp $prefix [$caller] $message"
|
||||||
|
|
||||||
# Display the message in the terminal
|
# Display the message in the terminal
|
||||||
echo -e "$colored_message" >&2
|
echo -e "$colored_message" >&2
|
||||||
|
|
Loading…
Reference in a new issue