v1.1.22-1

cleanup

Author: xavier-hernandez

README.md

@@ -153,6 +153,19 @@ services:
       - SKIP_ARCHIVED_LOGS
     - the following file(s) are read and parsed.
       - access.log
+    - You can also set the following environment variables yourself to override the defaults
+      - TIME_FORMAT
+      - DATE_FORMAT
+      - LOG_FORMAT  
+
+      ```
+      FOR EXAMPLE
+      ---------------------------------
+      TIME_FORMAT=%H:%M:%S
+      DATE_FORMAT=%Y-%m-%d
+      LOG_FORMAT='{"ClientHost": "%h", "ClientUsername": "%e", "DownstreamContentSize": "%b", "Duration": "%n", "DownstreamStatus": "%s", "RequestAddr": "%v", "RequestMethod": "%m", "RequestPath": "%U", "RequestProtocol": "%H", "StartUTC": "%dT%t.%^", "request_User-Agent": "%u"}'
+      ``````
+
   - NCSA_COMBINED
     - environment parameters that will not work and will be ignored
       - SKIP_ARCHIVED_LOGS
@@ -189,6 +202,7 @@ date-format %d/%b/%Y
 log-format %h %^[%d:%t %^] "%r" %s %b "%R" "%u" %Lm"
 ```
 
+
 # **Possible/Known Issues** 
 - A lot of CPU Usage and 10000 request every second in webUI
   - https://github.com/xavier-hernandez/goaccess-for-nginxproxymanager/issues/38

resources/scripts/logs/traefik.sh

@@ -32,15 +32,9 @@ function traefik_goaccess_config(){
     echo "# ${goan_version}" >> ${goan_config}
     echo "# GOAN_PROXY_CONFIG" >> ${goan_config}
     echo "######################################" >> ${goan_config}
-    if [ "$1" -eq 2 ]; then
-        echo "time-format ${TIME_FORMAT:-'%T'}" >> ${goan_config}
-        echo "date-format ${DATE_FORMAT:-'%d/%b/%Y'}" >> ${goan_config}
-        echo "log-format ${LOG_FORMAT:-'%h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm'}" >> ${goan_config}
-    else
-        echo "time-format %T" >> ${goan_config}
-        echo "date-format %d/%b/%Y" >> ${goan_config}
-        echo "log-format %h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm" >> ${goan_config}
-    fi
+    echo "time-format ${TIME_FORMAT:-'%T'}" >> ${goan_config}
+    echo "date-format ${DATE_FORMAT:-'%d/%b/%Y'}" >> ${goan_config}
+    echo "log-format ${LOG_FORMAT:-'%h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm'}" >> ${goan_config}
     echo "port 7890" >> ${goan_config}
     echo "real-time-html true" >> ${goan_config}
     echo "output ${nginx_html}" >> ${goan_config}

resources/scripts/start.sh

@@ -75,9 +75,7 @@ if [[ -z "${LOG_TYPE}" || "${LOG_TYPE}" == "NPM" || "${LOG_TYPE}" == "NPM+R"  ||
         npm_redirect
     fi
 elif [[ "${LOG_TYPE}" == "TRAEFIK" ]]; then
-    traefik 1
-elif [[ "${LOG_TYPE}" == "TRAEFIKv2" ]]; then
-    traefik 2
+    traefik
 elif [[ "${LOG_TYPE}" == "NCSA_COMBINED" ]]; then
     ncsa_combined
 elif [[ "${LOG_TYPE}" == "CUSTOM" ]]; then