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

Make lockwarning log file name settable; turn off if not set. Resolves #1161.

Browse source
This commit is contained in:
Griatch 2017-01-11 21:37:32 +01:00
parent 9e505b9b72
commit b57b807da6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/locks/lockhandler.py
View file

@ -114,7 +114,7 @@ from django.utils.translation import ugettext as _
__all__ = ("LockHandler", "LockException") __all__ = ("LockHandler", "LockException")
WARNING_LOG = "lockwarnings.log" WARNING_LOG = settings.LOCKWARNING_LOG_FILE
# #
# Exception class. This will be raised # Exception class. This will be raised
@ -247,7 +247,7 @@ class LockHandler(object):
wlist.append(_("LockHandler on %(obj)s: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' " % \ wlist.append(_("LockHandler on %(obj)s: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' " % \
{"obj":self.obj, "access_type":access_type, "source":locks[access_type][2], "goal":raw_lockstring})) {"obj":self.obj, "access_type":access_type, "source":locks[access_type][2], "goal":raw_lockstring}))
locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring) locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring)
if wlist: if wlist and WARNING_LOG:
# a warning text was set, it's not an error, so only report # a warning text was set, it's not an error, so only report
logger.log_file("\n".join(wlist), WARNING_LOG) logger.log_file("\n".join(wlist), WARNING_LOG)
if elist: if elist:

2
evennia/settings_default.py
View file

@ -119,6 +119,8 @@ LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs')
SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log') SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log')
PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log') PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log')
HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log') HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log')
# if this is set to the empty string, lockwarnings will be turned off.
LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, 'lockwarnings.log')
# Rotate log files when server and/or portal stops. This will keep log # Rotate log files when server and/or portal stops. This will keep log
# file sizes down. Turn off to get ever growing log files and never # file sizes down. Turn off to get ever growing log files and never
# loose log info. # loose log info.