From 3218dcfdab159c08be284953980fb2ee9d161ce0 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Fri, 26 Feb 2021 23:24:19 +0100 Subject: [PATCH] * router parsed after parsing request --- src/server.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server.sh b/src/server.sh index d68001a..c1b0c1b 100755 --- a/src/server.sh +++ b/src/server.sh @@ -6,7 +6,6 @@ source src/account.sh source src/mail.sh source src/route.sh [[ -f "${cfg[namespace]}/config.sh" ]] && source "${cfg[namespace]}/config.sh" -[[ -f "${cfg[namespace]}/routes.sh" ]] && source "${cfg[namespace]}/routes.sh" declare -A r # current request / response declare -A meta # metadata for templates @@ -115,6 +114,8 @@ fi echo "$(date) - IP: ${r[ip]}, PROTO: ${r[proto]}, URL: ${r[url]}, GET_data: ${get_data[@]}, POST_data: ${post_data[@]}, POST_multipart: ${post_multipart[@]}" >> "${cfg[namespace]}/${cfg[log]}" +[[ -f "${cfg[namespace]}/routes.sh" ]] && source "${cfg[namespace]}/routes.sh" + if [[ ${r[status]} != 101 ]]; then for (( i=0; i<${#route[@]}; i=i+3 )); do if [[ "$(grep -Poh "^${route[$((i+1))]}" <<< "${r[url]}")" != "" ]]; then