Rx3/network_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

- Add log type support,

Browse Source 
- Add NETWORK_LOG_TRACE config variable.
This commit is contained in:
Arnaud G. GIBERT
2025-07-26 00:01:24 +02:00
parent b76a23a9c7
commit 6996353536
6 changed files with 154 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
usr/local/lib/default.bash
View File

@@ -15,6 +15,7 @@ fi
declare -g LOG_FILE=""
declare -g LOG_LOCK=""
declare -g LOG_ECHO=""
declare -g LOG_TRACE="DISABLED"
@@ -289,7 +290,7 @@ file_unlock()
#--------------------------------------------------------------------------------------------------------------------------
# log_file_set
# log_set
#--------------------------------------------------------------------------------------------------------------------------
log_set()
@@ -297,47 +298,17 @@ log_set()
local log_file="$1"
local lock_file="$2"
local echo_function="$3"
local log_trace="$4"
LOG_FILE="${log_file}"
LOG_LOCK="${lock_file}"
LOG_ECHO="${echo_function}"
}
LOG_FILE="${log_file}"
LOG_LOCK="${lock_file}"
LOG_ECHO="${echo_function}"
#--------------------------------------------------------------------------------------------------------------------------
# log_print_file
#--------------------------------------------------------------------------------------------------------------------------
log_print_file()
{
local log_file="$1"
local lock_file="$2"
local echo_function="$3"
local log_prefix="$4"
shift; shift; shift; shift
${echo_function} "($BASHPID):" "$*"
if [[ "${log_file}" != "" ]]
then
if [[ "${lock_file}" != "" ]]
then
file_lock "${lock_file}" WRITE 8
fi
printf >> "${log_file}" "%s %9s %8s %s\n" "$(date --rfc-3339=seconds -u)" "($BASHPID)" "${log_prefix}:" "$*"
if [[ "${lock_file}" != "" ]]
then
file_unlock 8
fi
fi
if [[ ${log_trace} != "" ]]
then
LOG_TRACE="${log_trace}"
fi
}
@@ -350,5 +321,84 @@ log_print_file()
log_print()
{
log_print_file "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" $*
local log_file="$1"
local lock_file="$2"
local echo_function="$3"
local log_type="$4"
local log_prefix="$5"
shift; shift; shift; shift; shift
if [[ "${log_type}" != "TRA" ]] || [[ "${LOG_TRACE}" != "DISABLED" ]]
then
${echo_function} "($BASHPID):" "$*"
if [[ "${log_file}" != "" ]]
then
if [[ "${lock_file}" != "" ]]
then
file_lock "${lock_file}" WRITE 8
fi
printf >> "${log_file}" "%s %9s %3s %8s %s\n" "$(date --rfc-3339=seconds -u)" "($BASHPID)" "${log_type}" "${log_prefix}:" "$*"
if [[ "${lock_file}" != "" ]]
then
file_unlock 8
fi
fi
fi
}
#--------------------------------------------------------------------------------------------------------------------------
# log_trace
#--------------------------------------------------------------------------------------------------------------------------
log_trace()
{
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "TRA" $*
}
#--------------------------------------------------------------------------------------------------------------------------
# log_info
#--------------------------------------------------------------------------------------------------------------------------
log_info()
{
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "INF" $*
}
#--------------------------------------------------------------------------------------------------------------------------
# log_warning
#--------------------------------------------------------------------------------------------------------------------------
log_warning()
{
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "WRN" $*
}
#--------------------------------------------------------------------------------------------------------------------------
# log_error
#--------------------------------------------------------------------------------------------------------------------------
log_error()
{
log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" $*
}