@@ -60,7 +60,7 @@ _fabasoad_log_init() {
6060_fabasoad_wrap_text_with_color () {
6161 log_line=" ${1} "
6262 level=" ${2} "
63- if [ " ${FABASOAD_LOG_CONFIG_TEXT_COLOR:- ${FABASOAD_LOG_CONFIG_TEXT_COLOR_DEFAULT} } " = " true" ]; then
63+ if [ " ${FABASOAD_LOG_CONFIG_TEXT_COLOR} " = " true" ]; then
6464 if [ " ${level} " = " error" ]; then
6565 printf " \033[91m${log_line} \033[0m"
6666 elif [ " ${level} " = " warning" ]; then
@@ -76,7 +76,7 @@ _fabasoad_wrap_text_with_color() {
7676}
7777
7878_fabasoad_wrap_text_with_bold () {
79- if [ " ${FABASOAD_LOG_CONFIG_TEXT_COLOR:- ${FABASOAD_LOG_CONFIG_TEXT_COLOR_DEFAULT} } " = " true" ]; then
79+ if [ " ${FABASOAD_LOG_CONFIG_TEXT_COLOR} " = " true" ]; then
8080 echo " \033[1m${1} \033[22m"
8181 else
8282 echo " ${1} "
@@ -86,7 +86,7 @@ _fabasoad_wrap_text_with_bold() {
8686# Log level
8787
8888_fabasoad_is_printing_error_ok () {
89- log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL:- ${FABASOAD_LOG_CONFIG_LOG_LEVEL_DEFAULT} } "
89+ log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL} "
9090 if [ " ${log_level} " != " off" ]; then
9191 echo " true"
9292 else
@@ -95,7 +95,7 @@ _fabasoad_is_printing_error_ok() {
9595}
9696
9797_fabasoad_is_printing_warning_ok () {
98- log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL:- ${FABASOAD_LOG_CONFIG_LOG_LEVEL_DEFAULT} } "
98+ log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL} "
9999 if [ " ${log_level} " != " off" ] && [ " ${log_level} " != " error" ]; then
100100 echo " true"
101101 else
@@ -104,7 +104,7 @@ _fabasoad_is_printing_warning_ok() {
104104}
105105
106106_fabasoad_is_printing_info_ok () {
107- log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL:- ${FABASOAD_LOG_CONFIG_LOG_LEVEL_DEFAULT} } "
107+ log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL} "
108108 if [ " ${log_level} " = " debug" ] || [ " ${log_level} " = " info" ]; then
109109 echo " true"
110110 else
@@ -113,7 +113,7 @@ _fabasoad_is_printing_info_ok() {
113113}
114114
115115_fabasoad_is_printing_debug_ok () {
116- log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL:- ${FABASOAD_LOG_CONFIG_LOG_LEVEL_DEFAULT} } "
116+ log_level=" ${FABASOAD_LOG_CONFIG_LOG_LEVEL} "
117117 if [ " ${log_level} " = " debug" ]; then
118118 echo " true"
119119 else
@@ -142,9 +142,9 @@ _fabasoad_log_text() {
142142 level=" ${1} "
143143 message=" ${2} "
144144
145- text_msg=" ${FABASOAD_LOG_CONFIG_TEXT_FORMAT:- ${FABASOAD_LOG_CONFIG_TEXT_FORMAT_DEFAULT} } "
146- text_msg=${text_msg/ <header>/ ${FABASOAD_LOG_CONFIG_HEADER:- ${FABASOAD_LOG_CONFIG_HEADER_DEFAULT} } }
147- text_msg=${text_msg/ <timestamp>/ $(date +" ${FABASOAD_LOG_CONFIG_DATE_FORMAT:- ${FABASOAD_LOG_CONFIG_DATE_FORMAT_DEFAULT} } " )}
145+ text_msg=" ${FABASOAD_LOG_CONFIG_TEXT_FORMAT} "
146+ text_msg=${text_msg/ <header>/ ${FABASOAD_LOG_CONFIG_HEADER} }
147+ text_msg=${text_msg/ <timestamp>/ $(date +" ${FABASOAD_LOG_CONFIG_DATE_FORMAT} " )}
148148 text_msg=${text_msg/ <level>/ $(_fabasoad_wrap_text_with_bold " ${level} " )}
149149 text_msg=${text_msg/ <message>/ ${message} }
150150
@@ -153,12 +153,9 @@ _fabasoad_log_text() {
153153}
154154
155155_fabasoad_log_json () {
156- timestamp=" $( date +" ${FABASOAD_LOG_CONFIG_DATE_FORMAT:- ${FABASOAD_LOG_CONFIG_DATE_FORMAT_DEFAULT} } " ) "
157- header=" ${FABASOAD_LOG_CONFIG_HEADER:- ${FABASOAD_LOG_CONFIG_HEADER_DEFAULT} } "
158-
159156 json_msg=$( jq -cn \
160- --arg timestamp " ${timestamp} " \
161- --arg header " ${header } " \
157+ --arg timestamp " $( date + " ${FABASOAD_LOG_CONFIG_DATE_FORMAT} " ) " \
158+ --arg header " ${FABASOAD_LOG_CONFIG_HEADER } " \
162159 --arg level " ${1} " \
163160 --arg message " ${2} " \
164161 ' {
@@ -176,8 +173,8 @@ _fabasoad_log_xml() {
176173 message=" ${2} "
177174
178175 xml_msg=" <log>"
179- xml_msg=" ${xml_msg} <timestamp>$( date +" ${FABASOAD_LOG_CONFIG_DATE_FORMAT:- ${FABASOAD_LOG_CONFIG_DATE_FORMAT_DEFAULT} } " ) </timestamp>"
180- xml_msg=" ${xml_msg} <header>${FABASOAD_LOG_CONFIG_HEADER:- ${FABASOAD_LOG_CONFIG_HEADER_DEFAULT} } </header>"
176+ xml_msg=" ${xml_msg} <timestamp>$( date +" ${FABASOAD_LOG_CONFIG_DATE_FORMAT} " ) </timestamp>"
177+ xml_msg=" ${xml_msg} <header>${FABASOAD_LOG_CONFIG_HEADER} </header>"
181178 xml_msg=" ${xml_msg} <level>${level} </level>"
182179 xml_msg=" ${xml_msg} <message>${message} </message>"
183180 xml_msg=" ${xml_msg} </log>"
@@ -197,27 +194,8 @@ _fabasoad_log_xml() {
197194# fabasoad_log "error" "This is error message"
198195# fabasoad_log "debug" "This is debug message" "./config.json"
199196fabasoad_log () {
200- level=" ${1} "
201- message=" ${2} "
202- config_path=" ${3:- " " } "
203-
204- if [ -f " ${config_path} " ]; then
205- _fabasoad_log_init " ${config_path} "
206- fi
207-
208- case " ${FABASOAD_LOG_CONFIG_OUTPUT_FORMAT:- ${FABASOAD_LOG_CONFIG_OUTPUT_FORMAT_DEFAULT} } " in
209- " xml" )
210- log_func=" _fabasoad_log_xml"
211- ;;
212- " json" )
213- log_func=" _fabasoad_log_json"
214- ;;
215- * )
216- log_func=" _fabasoad_log_text"
217- ;;
218- esac
219-
220- ${log_func} " ${level} " " ${message} "
197+ _fabasoad_log_init " ${3:- " " } "
198+ _fabasoad_log_${FABASOAD_LOG_CONFIG_OUTPUT_FORMAT} " ${1} " " ${2} "
221199}
222200
223201# export
0 commit comments