Просмотр исходного кода

fix #693 - remove MISAGO_MAILER_BATCH_SIZE setting

Rafał Pitoń 8 лет назад
Родитель
Сommit
26ff71d6c9
3 измененных файлов с 9 добавлено и 16 удалено
  1. 0 6
      docs/developers/settings.rst
  2. 0 6
      misago/conf/defaults.py
  3. 9 4
      misago/conf/tests/test_settings.py

+ 0 - 6
docs/developers/settings.rst

@@ -276,12 +276,6 @@ MISAGO_LOGIN_API_URL
 URL to API endpoint used to authenticate sign-in credentials. Musn't contain api prefix or wrapping slashes. Defaults to 'auth/login'.
 
 
-MISAGO_MAILER_BATCH_SIZE
-------------------------
-
-Default maximum size of single mails package that Misago will build before sending mails and creating next package.
-
-
 MISAGO_MARKUP_EXTENSIONS
 ------------------------
 

+ 0 - 6
misago/conf/defaults.py

@@ -101,12 +101,6 @@ MISAGO_USE_STOP_FORUM_SPAM = True
 MISAGO_STOP_FORUM_SPAM_MIN_CONFIDENCE = 80
 
 
-# How many e-mails should be sent in single step.
-# This is used for conserving memory usage when mailing many users at same time
-
-MISAGO_MAILER_BATCH_SIZE = 20
-
-
 # Login API URL
 
 MISAGO_LOGIN_API_URL = 'auth'

+ 9 - 4
misago/conf/tests/test_settings.py

@@ -1,6 +1,6 @@
 from django.apps import apps
 from django.conf import settings as dj_settings
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from misago.core import threadstore
 from misago.core.cache import cache
@@ -17,7 +17,7 @@ class DBSettingsTests(TestCase):
         self.assertEqual(db_settings.forum_name, 'Misago')
 
         with self.assertRaises(AttributeError):
-            db_settings.MISAGO_MAILER_BATCH_SIZE
+            db_settings.MISAGO_THREADS_PER_PAGE
 
 
 class GatewaySettingsTests(TestCase):
@@ -30,12 +30,17 @@ class GatewaySettingsTests(TestCase):
         self.assertEqual(gateway.forum_name, db_settings.forum_name)
         self.assertEqual(gateway.INSTALLED_APPS,
                          dj_settings.INSTALLED_APPS)
-        self.assertEqual(gateway.MISAGO_MAILER_BATCH_SIZE,
-                         defaults.MISAGO_MAILER_BATCH_SIZE)
+        self.assertEqual(gateway.MISAGO_THREADS_PER_PAGE,
+                         defaults.MISAGO_THREADS_PER_PAGE)
 
         with self.assertRaises(AttributeError):
             gateway.LoremIpsum
 
+    @override_settings(MISAGO_THREADS_PER_PAGE=1234)
+    def test_override_file_setting(self):
+        """file settings are overrideable"""
+        self.assertEqual(gateway.MISAGO_THREADS_PER_PAGE, 1234)
+
     def test_setting_public(self):
         """get_public_settings returns public settings"""
         test_group = {