Clean code

Author: meomancer

deployment/.template.env

@@ -43,6 +43,15 @@ EMAIL_USE_TLS=
 EMAIL_USE_SSL=
 DEFAULT_FROM_EMAIL=
 
+# -------------------------------
+# ---------- LOG ROTATE ------------
+# log rotate max files
+LOGROTATE_COPIES=14
+# log rotate max size per file
+LOGROTATE_SIZE=100M
+# log rotate interval check
+LOGROTATE_INTERVAL=daily
+
 # --------------------------------
 # ---------- APP DOMAIN ----------
 # Required for tenant configurations
@@ -60,10 +69,3 @@ APP_DOMAIN=localhost
 # - machine_info_fetcher
 PLUGINS=
 # -----------------------------
-
-# log rotate max files
-LOGROTATE_COPIES=14
-# log rotate max size per file
-LOGROTATE_SIZE=100M
-# log rotate interval check
-LOGROTATE_INTERVAL=daily

deployment/docker-compose.yml

@@ -20,8 +20,8 @@ volumes:
   backups-data:
   rabbitmq:
   redis-data:
-  tmp-data:
   redis-conf:
+  tmp-data:
   tmp-logrotate:
 
 x-common-django:
@@ -157,6 +157,7 @@ services:
 
   logrotate:
     image: blacklabelops/logrotate:1.3
+    container_name: "geosight_logrotate"
     volumes:
       - tmp-data:/logs
       - tmp-logrotate:/tmp

django_project/core/migrations/0035_logfile.py

@@ -196,4 +196,5 @@
 # Logs Directory
 # ----------------------------------------
 LOGS_DIRECTORY = os.environ.get(
-    'LOGS_DIRECTORY', '/home/web/logs')
+    'LOGS_DIRECTORY', '/home/web/logs'
+)

django_project/core/migrations/0036_delete_logfile.py

@@ -22,11 +22,11 @@ echo "STARTING DJANGO ENTRYPOINT $(date)"
 echo "-----------------------------------------------------"
 
 # Run NPM
-#cd /home/web/django_project/frontend
-#echo "npm install"
-#npm install --verbose
-#echo "npm build"
-#npm run build
+cd /home/web/django_project/frontend
+echo "npm install"
+npm install --verbose
+echo "npm build"
+npm run build
 
 # Run initialization
 cd /home/web/django_project

django_project/core/settings/project.py

@@ -59,8 +59,10 @@ def download_link(self, obj):
         """Get download link for LogFile."""
         return format_html(
             '<a href="{}">Download</a>',
-            reverse('admin:dashboard_download_log_file',
-                    args=[obj.pk])
+            reverse(
+                'admin:dashboard_download_log_file',
+                args=[obj.pk]
+            )
         )
 
     download_link.short_description = 'Download Log File'