Merge pull request #241 from unicef-drp/remove-uwsgi-log

Remove uwsgi log

deployment/docker/uwsgi.conf

@@ -21,4 +21,5 @@ env = DJANGO_SETTINGS_MODULE=core.settings.prod
 memory-report = true
 # increase harakiri timeout to 6mins
 harakiri = 300
-buffer-size = 8192
+buffer-size = 8192
+disable-logging=True

deployment/docker/uwsgi_auth.conf

@@ -21,4 +21,5 @@ env = DJANGO_SETTINGS_MODULE=core.settings.prod
 # uid = 1000
 # gid = 1000
 memory-report = true
-harakiri = 20
+harakiri = 20
+disable-logging=True

django_project/dashboard/api_views/notification.py

@@ -1,6 +1,5 @@
-from datetime import datetime
-
 from django.db.models import Q
+from django.utils import timezone
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from azure_auth.backends import AzureAuthRequiredMixin
@@ -32,7 +31,7 @@ def get_notification_list(self):
         return serializer.data
 
     def get_maintenance(self):
-        current_datetime = datetime.now()
+        current_datetime = timezone.now()
         maintenance = Maintenance.objects.filter(
             scheduled_from_date__lte=current_datetime
         ).filter(

django_project/dashboard/migrations/0093_alter_maintenance_scheduled_from_date.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.7 on 2024-10-15 20:14
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0092_layeruploadsession_validation_report_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='maintenance',
+            name='scheduled_from_date',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

django_project/dashboard/models/maintenance.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from datetime import datetime
+from django.utils import timezone
 
 
 class Maintenance(models.Model):
@@ -17,7 +17,7 @@ class Maintenance(models.Model):
     )
 
     scheduled_from_date = models.DateTimeField(
-        default=datetime.now,
+        default=timezone.now,
         null=False,
         blank=False
     )

django_project/dashboard/tests/test_notification.py

@@ -55,7 +55,7 @@ def test_notification_list(self):
         self.assertEqual(Notification.objects.filter(
             recipient=user_2).count(), 1)
 
-    @mock.patch('dashboard.api_views.notification.datetime')
+    @mock.patch('dashboard.api_views.notification.timezone')
     def test_check_for_maintenance(self, mocked_datetime):
         user_1 = UserF.create()
         mocked_datetime.now.return_value = datetime.strptime(