From 4cb3fc70125044d19ecb9da95fc311764e53f37d Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 20 Jan 2018 00:14:04 +0100 Subject: [PATCH] Add MERGE_LOGS for those not wanting to merge server/portal logs --- evennia/server/portal/portal.py | 4 ++-- evennia/settings_default.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index d522975999..d7fcadcbcb 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -184,8 +184,8 @@ class Portal(object): application = service.Application('Portal') # custom logging -logfile = logger.WeeklyLogFile(os.path.basename(settings.SERVER_LOG_FILE), - os.path.dirname(settings.SERVER_LOG_FILE)) +logfile = settings.SERVER_LOG_FILE if settings.MERGE_LOGS else settings.PORTAL_LOG_FILE +logfile = logger.WeeklyLogFile(os.path.basename(logfile), os.path.dirname(logfile)) application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit) # The main Portal server program. This sets up the database diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 2b6bb55584..3bb2b504aa 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -134,6 +134,8 @@ LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs') SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log') PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log') HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log') +# if this is true, merge logs into only the SERVER_LOG_FILE location. +MERGE_LOGS = True # 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