diff --git a/deployment/docker/uwsgi.conf b/deployment/docker/uwsgi.conf index 81268470..9de418a4 100644 --- a/deployment/docker/uwsgi.conf +++ b/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 \ No newline at end of file +buffer-size = 8192 +disable-logging=True \ No newline at end of file diff --git a/deployment/docker/uwsgi_auth.conf b/deployment/docker/uwsgi_auth.conf index bd98370e..06bb5d51 100644 --- a/deployment/docker/uwsgi_auth.conf +++ b/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 \ No newline at end of file +harakiri = 20 +disable-logging=True \ No newline at end of file diff --git a/django_project/dashboard/api_views/notification.py b/django_project/dashboard/api_views/notification.py index 97001798..11f852b1 100644 --- a/django_project/dashboard/api_views/notification.py +++ b/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( diff --git a/django_project/dashboard/migrations/0093_alter_maintenance_scheduled_from_date.py b/django_project/dashboard/migrations/0093_alter_maintenance_scheduled_from_date.py new file mode 100644 index 00000000..e2b3d35e --- /dev/null +++ b/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), + ), + ] diff --git a/django_project/dashboard/models/maintenance.py b/django_project/dashboard/models/maintenance.py index 03f8e846..8d4243ef 100644 --- a/django_project/dashboard/models/maintenance.py +++ b/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 ) diff --git a/django_project/dashboard/tests/test_notification.py b/django_project/dashboard/tests/test_notification.py index 0da01ad4..5a145874 100644 --- a/django_project/dashboard/tests/test_notification.py +++ b/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(