Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
up:
docker compose -f docker-compose.yml up -d
down:
docker compose -f docker-compose.yml down
docker compose -f docker-compose.yml down

run-local:
poetry run daphne -b 0.0.0.0 -p 8000 procollab.asgi:application
38 changes: 21 additions & 17 deletions core/log/middleware.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
from loguru import logger
from django.conf import settings
import copy
import logging

from django.conf import settings
from loguru import logger

from core.log.utils import InterceptHandler


def _add_logger_handler(path: str, level: str) -> None:
"""
Attach loguru handler, falling back to synchronous mode if multiprocessing
queues are not permitted (e.g. limited dev envs).
"""
kwargs = copy.deepcopy(settings.LOGURU_LOGGING)
try:
logger.add(path, level=level, **kwargs)
except PermissionError:
kwargs.pop("enqueue", None)
logger.add(path, level=level, **kwargs)


class CustomLoguruMiddleware:
def __init__(self, get_response):
self.get_response = get_response
logging.basicConfig(handlers=[InterceptHandler()], level=0, force=True)

if settings.DEBUG:
logger.add(
f"{settings.BASE_DIR}/log/debug.log",
level="DEBUG",
**settings.LOGURU_LOGGING,
)
logger.add(
f"{settings.BASE_DIR}/log/info.log",
level="INFO",
**settings.LOGURU_LOGGING,
)
logger.add(
f"{settings.BASE_DIR}/log/warning.log",
level="WARNING",
**settings.LOGURU_LOGGING,
)
_add_logger_handler(f"{settings.BASE_DIR}/log/debug.log", "DEBUG")
_add_logger_handler(f"{settings.BASE_DIR}/log/info.log", "INFO")
_add_logger_handler(f"{settings.BASE_DIR}/log/warning.log", "WARNING")

def __call__(self, request):
response = self.get_response(request)
Expand Down
10 changes: 6 additions & 4 deletions files/models.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import reprlib

from django.contrib.auth import get_user_model
from django.conf import settings
from django.db import models

User = get_user_model()


class UserFile(models.Model):
"""
Expand All @@ -20,7 +18,11 @@ class UserFile(models.Model):
"""

link = models.URLField(primary_key=True, null=False)
user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
on_delete=models.SET_NULL,
null=True,
)
datetime_uploaded = models.DateTimeField(auto_now_add=True)
name = models.TextField(blank=False, default="file")
extension = models.TextField(blank=True, default="")
Expand Down
11 changes: 7 additions & 4 deletions procollab/asgi.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import os
import chats.routing

from channels.routing import ProtocolTypeRouter, URLRouter
from django.core.asgi import get_asgi_application

from chats.middleware import TokenAuthMiddleware

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "procollab.settings")

# Ensure Django app registry is loaded before importing project routes.
django_asgi_app = get_asgi_application()

import chats.routing # noqa: E402
from chats.middleware import TokenAuthMiddleware # noqa: E402

application = ProtocolTypeRouter(
{
"http": get_asgi_application(),
"http": django_asgi_app,
"websocket": TokenAuthMiddleware(URLRouter(chats.routing.websocket_urlpatterns)),
}
)
4 changes: 3 additions & 1 deletion scripts/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

python manage.py migrate
python manage.py collectstatic --no-input
python manage.py runserver 0.0.0.0:8000

# Use Daphne ASGI server instead of Django's dev server.
exec daphne -b 0.0.0.0 -p 8000 procollab.asgi:application