feat: Append entrypoint logs to file; ensure uri encode

Author: vedharish

Access/views.py

@@ -43,6 +43,7 @@
 INVALID_REQUEST_MESSAGE = "Error in request not found OR Invalid request type"
 
 logger = logging.getLogger(__name__)
+logger.info("Server Started")
 
 
 @login_required

EnigmaAutomation/settings.py

@@ -250,7 +250,7 @@
         'file': {
             'level': current_log_level,
             'class': 'logging.FileHandler',
-            'filename': './enigma.log',
+            'filename': '/ebs/logs/enigma.log',
             'formatter': 'verbose',
         },
         "console": {
@@ -259,11 +259,11 @@
             "formatter": "verbose",
         },
     },
-    "loggers": { },
+    "loggers": {},
 }
 for each_app in logging_apps:
     LOGGING["loggers"][each_app] = {
-        "handlers": ["file", "console"],
+        "handlers": ["console"],
         "level": current_log_level,
         "propagate": True,
         "formatter": "verbose",

bootprocess/views.py

@@ -20,4 +20,5 @@ def logout_view(request):
 def dashboard(request):
     """Loaded dashboard"""
     context = getDashboardData(request)
+    logger.info("Dashboard load for user %s", request.user.username)
     return render(request, "EnigmaOps/dashboard.html", context)

docker-entrypoint.sh

@@ -1,23 +1,37 @@
 #!/bin/bash
 
-echo "===== Cloning Access Modules ====="
-python scripts/clone_access_modules.py
+LOG_FILE=/ebs/logs/enigma.log
+CONTAINER_HASH=$(echo $RANDOM | md5sum | head -c 20)
 
-echo "===== Install requirements for access modules ====="
-pip install -r Access/access_modules/requirements.txt --no-cache-dir --ignore-installed
+function log() {
+  echo "$(date): $CONTAINER_HASH $@" 2>&1 | tee $LOG_FILE
+}
 
-echo "===== Ensure DB State ====="
-python manage.py createcachetable
-python manage.py migrate        # Apply database migrations
+function prepend() {
+  while read line; do
+    echo "${line}"
+    echo "$(date): $CONTAINER_HASH -- ${line}" >> $LOG_FILE
+  done
+}
 
-echo "===== Ensure Static Files ====="
-python manage.py collectstatic --clear --noinput # clearstatic files
-python manage.py collectstatic --noinput  # collect static files
+
+log "===== Cloning Access Modules ====="
+python scripts/clone_access_modules.py 2>&1 | prepend
+
+log "===== Install requirements for access modules ====="
+pip install -r Access/access_modules/requirements.txt --no-cache-dir --ignore-installed 2>&1 | prepend
+
+log "===== Ensure DB State ====="
+python manage.py createcachetable 2>&1 | prepend
+python manage.py migrate 2>&1 | prepend
+
+log "===== Ensure Static Files ====="
+python manage.py collectstatic --clear --noinput 2>&1 | prepend
+python manage.py collectstatic --noinput 2>&1 | prepend
 
 # directory for gunicorn logs and django app logs
-echo "===== Ensure Logs ====="
+log "===== Ensure Logs ====="
 touch /ebs/logs/enigma.log
-tail -n 0 -f /ebs/logs/enigma.log &
 
-echo "===== Running Service ====="
-eval "$@"
+log "===== Running Service ====="
+eval "$@" 2>&1 | prepend

templates/EnigmaOps/pendingRequests.html

@@ -213,7 +213,7 @@
 
             $(`.${selector}`).each(function () {
                 if ($(this).is(":checked"))
-                    reqParams.push(`requestId=${$(this).val()}`)
+                    reqParams.push(encodeURIComponent(`requestId=${$(this).val()}`))
                 request_ids.push($(this).val())
             });
 
@@ -242,7 +242,7 @@
             let urlBuilder = `/accept_bulk/${selector}?`
             request_id = $(this).val()
             reqParams = []
-            reqParams.push(`requestId=${request_id}`)
+            reqParams.push(encodeURIComponent(`requestId=${request_id}`))
 
             urlBuilder = urlBuilder + reqParams.join("&")
             div_id = request_id + "-action"