GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-17 14:01:03 +01:00
Code Issues Projects Releases Wiki Activity

core: update stdout log level on REHASH

Browse Source
This commit is contained in:
James Lu 2017-01-07 00:10:47 -08:00
parent a2e7a35998
commit b2286157ef
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coremods/control.py
View File

@ -6,7 +6,7 @@ import os
import threading import threading
from pylinkirc import world, utils, conf, classes from pylinkirc import world, utils, conf, classes
from pylinkirc.log import log, makeFileLogger, stopFileLoggers from pylinkirc.log import log, makeFileLogger, stopFileLoggers, stdoutLogLevel
from . import permissions from . import permissions
def remove_network(ircobj): def remove_network(ircobj):
@ -70,8 +70,11 @@ def _rehash():
for filename, config in files.items(): for filename, config in files.items():
makeFileLogger(filename, config.get('loglevel')) makeFileLogger(filename, config.get('loglevel'))
log.debug('rehash: updating STDOUT log level')
world.stdout_handler.setLevel(stdoutLogLevel())
# Reset permissions. # Reset permissions.
log.debug('rehash: resetting permissions.') log.debug('rehash: resetting permissions')
permissions.resetPermissions() permissions.resetPermissions()
for network, ircobj in world.networkobjects.copy().items(): for network, ircobj in world.networkobjects.copy().items():

11
log.py
View File

@ -15,18 +15,23 @@ from . import world, conf
# Stores a list of active file loggers. # Stores a list of active file loggers.
fileloggers = [] fileloggers = []
stdout_level = conf.conf['logging'].get('stdout') or 'INFO'
logdir = os.path.join(os.getcwd(), 'log') logdir = os.path.join(os.getcwd(), 'log')
os.makedirs(logdir, exist_ok=True) os.makedirs(logdir, exist_ok=True)
# TODO: perhaps make this format configurable?
_format = '%(asctime)s [%(levelname)s] %(message)s' _format = '%(asctime)s [%(levelname)s] %(message)s'
logformatter = logging.Formatter(_format) logformatter = logging.Formatter(_format)
def stdoutLogLevel():
"""
Returns the configured STDOUT log level.
"""
return conf.conf['logging'].get('stdout') or 'INFO'
# Set up logging to STDERR # Set up logging to STDERR
world.stdout_handler = logging.StreamHandler() world.stdout_handler = logging.StreamHandler()
world.stdout_handler.setFormatter(logformatter) world.stdout_handler.setFormatter(logformatter)
world.stdout_handler.setLevel(stdout_level) world.stdout_handler.setLevel(stdoutLogLevel())
# Get the main logger object; plugins can import this variable for convenience. # Get the main logger object; plugins can import this variable for convenience.
log = logging.getLogger() log = logging.getLogger()