GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

log: rename methods to snake case (#523)

Browse Source
This commit is contained in:
James Lu 2018-03-02 19:55:17 -08:00
parent ad5a11bf34
commit 9e3f412f0b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coremods/control.py
View File

@ -8,7 +8,7 @@ import sys
import atexit import atexit
from pylinkirc import world, utils, conf # Do not import classes, it'll import loop from pylinkirc import world, utils, conf # Do not import classes, it'll import loop
from pylinkirc.log import log, makeFileLogger, stopFileLoggers, getConsoleLogLevel from pylinkirc.log import log, _make_file_logger, _stop_file_loggers, _get_console_log_level
from . import permissions from . import permissions
def remove_network(ircobj): def remove_network(ircobj):
@ -96,14 +96,14 @@ def rehash():
conf.conf = new_conf conf.conf = new_conf
# Reset any file logger options. # Reset any file logger options.
stopFileLoggers() _stop_file_loggers()
files = new_conf['logging'].get('files') files = new_conf['logging'].get('files')
if files: if files:
for filename, config in files.items(): for filename, config in files.items():
makeFileLogger(filename, config.get('loglevel')) _make_file_logger(filename, config.get('loglevel'))
log.debug('rehash: updating console log level') log.debug('rehash: updating console log level')
world.console_handler.setLevel(getConsoleLogLevel()) world.console_handler.setLevel(_get_console_log_level())
for network, ircobj in world.networkobjects.copy().items(): for network, ircobj in world.networkobjects.copy().items():
# Server was removed from the config file, disconnect them. # Server was removed from the config file, disconnect them.

12
log.py
View File

@ -22,7 +22,7 @@ os.makedirs(logdir, exist_ok=True)
_format = '%(asctime)s [%(levelname)s] %(message)s' _format = '%(asctime)s [%(levelname)s] %(message)s'
logformatter = logging.Formatter(_format) logformatter = logging.Formatter(_format)
def getConsoleLogLevel(): def _get_console_log_level():
""" """
Returns the configured console log level. Returns the configured console log level.
""" """
@ -32,7 +32,7 @@ def getConsoleLogLevel():
# Set up logging to STDERR # Set up logging to STDERR
world.console_handler = logging.StreamHandler() world.console_handler = logging.StreamHandler()
world.console_handler.setFormatter(logformatter) world.console_handler.setFormatter(logformatter)
world.console_handler.setLevel(getConsoleLogLevel()) world.console_handler.setLevel(_get_console_log_level())
# 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()
@ -43,7 +43,7 @@ log.addHandler(world.console_handler)
# the root logger. https://stackoverflow.com/questions/16624695 # the root logger. https://stackoverflow.com/questions/16624695
log.setLevel(1) log.setLevel(1)
def makeFileLogger(filename, level=None): def _make_file_logger(filename, level=None):
""" """
Initializes a file logging target with the given filename and level. Initializes a file logging target with the given filename and level.
""" """
@ -64,7 +64,7 @@ def makeFileLogger(filename, level=None):
filelogger.setFormatter(logformatter) filelogger.setFormatter(logformatter)
# If no log level is specified, use the same one as the console logger. # If no log level is specified, use the same one as the console logger.
level = level or getConsoleLogLevel() level = level or _get_console_log_level()
filelogger.setLevel(level) filelogger.setLevel(level)
log.addHandler(filelogger) log.addHandler(filelogger)
@ -73,7 +73,7 @@ def makeFileLogger(filename, level=None):
return filelogger return filelogger
def stopFileLoggers(): def _stop_file_loggers():
""" """
De-initializes all file loggers. De-initializes all file loggers.
""" """
@ -88,7 +88,7 @@ files = conf.conf['logging'].get('files')
if files: if files:
for filename, config in files.items(): for filename, config in files.items():
if isinstance(config, dict): if isinstance(config, dict):
makeFileLogger(filename, config.get('loglevel')) _make_file_logger(filename, config.get('loglevel'))
else: else:
log.warning('Got invalid file logging pair %r: %r; are your indentation and block ' log.warning('Got invalid file logging pair %r: %r; are your indentation and block '
'commenting consistent?', filename, config) 'commenting consistent?', filename, config)