Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move settings to be local imports to prevent conflicts before django is fully loaded

Browse source
This commit is contained in:
Tehom 2017-05-21 06:59:54 -04:00
parent 4605b3128e
commit 2bea778181
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/utils/logger.py
View file

@ -21,7 +21,6 @@ from datetime import datetime
from traceback import format_exc from traceback import format_exc
from twisted.python import log, logfile from twisted.python import log, logfile
from twisted.internet.threads import deferToThread from twisted.internet.threads import deferToThread
from django.conf import settings
_LOGDIR = None _LOGDIR = None
@ -161,6 +160,7 @@ class EvenniaLogFile(logfile.LogFile):
lines of the previous log to the start of the new log, in order lines of the previous log to the start of the new log, in order
to preserve a continuous chat history for channel log files. to preserve a continuous chat history for channel log files.
""" """
from django.conf import settings
num_lines_to_append = settings.CHANNEL_LOG_NUM_TAIL_LINES num_lines_to_append = settings.CHANNEL_LOG_NUM_TAIL_LINES
def rotate(self): def rotate(self):
@ -209,6 +209,7 @@ def _open_log_file(filename):
handle. Will create a new file in the log dir if one didn't handle. Will create a new file in the log dir if one didn't
exist. exist.
""" """
from django.conf import settings
global _LOG_FILE_HANDLES, _LOGDIR global _LOG_FILE_HANDLES, _LOGDIR
if not _LOGDIR: if not _LOGDIR:
_LOGDIR = settings.LOG_DIR _LOGDIR = settings.LOG_DIR