MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backend-glitches' into 'develop' 

Fixed websocket error under django 3

See merge request funkwhale/funkwhale!1040
This commit is contained in:
Eliot Berriot 2020-02-25 17:30:09 +01:00
parent be32a671fc 95c1e45f4b
commit cfe7317f65
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/config/settings/common.py
View File

@ -12,6 +12,7 @@ from __future__ import absolute_import, unicode_literals
import datetime import datetime
import logging.config import logging.config
import os
import sys import sys
from urllib.parse import urlsplit from urllib.parse import urlsplit
@ -126,6 +127,11 @@ FUNKWHALE_SPA_REWRITE_MANIFEST_URL = env.bool(
APP_NAME = "Funkwhale" APP_NAME = "Funkwhale"
# XXX: for backward compat with django 2.2, remove this when django 2.2 support is dropped
os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = env.bool(
"DJANGO_ALLOW_ASYNC_UNSAFE", default="true"
)
# XXX: deprecated, see #186 # XXX: deprecated, see #186
FEDERATION_ENABLED = env.bool("FEDERATION_ENABLED", default=True) FEDERATION_ENABLED = env.bool("FEDERATION_ENABLED", default=True)
FEDERATION_HOSTNAME = env("FEDERATION_HOSTNAME", default=FUNKWHALE_HOSTNAME).lower() FEDERATION_HOSTNAME = env("FEDERATION_HOSTNAME", default=FUNKWHALE_HOSTNAME).lower()