Merge branch 'master' into production

[wolnelektury.git] / apps / waiter / settings.py

diff --git a/apps/waiter/settings.py b/apps/waiter/settings.py
index f75edfe..08e88d3 100644 (file)
--- a/apps/waiter/settings.py
+++ b/apps/waiter/settings.py
@@ -1,12 +1,18 @@
-from os.path import join
+from os.path import abspath, join

 from django.conf import settings
 
 try:
 from django.conf import settings
 
 try:

-    WAITER_ROOT = settings.WAITER_ROOT
+    WAITER_ROOT = abspath(settings.WAITER_ROOT)

 except AttributeError:
 except AttributeError:

-    WAITER_ROOT = join(settings.MEDIA_ROOT, 'waiter')
+    WAITER_ROOT = abspath(join(settings.MEDIA_ROOT, 'waiter'))

 
 try:
     WAITER_URL = settings.WAITER_URL
 except AttributeError:
     WAITER_URL = join(settings.MEDIA_URL, 'waiter')
 
 try:
     WAITER_URL = settings.WAITER_URL
 except AttributeError:
     WAITER_URL = join(settings.MEDIA_URL, 'waiter')

+
+try:
+    WAITER_MAX_QUEUE = settings.WAITER_MAX_QUEUE
+except AttributeError:
+    WAITER_MAX_QUEUE = 20
+