mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-01 01:09:22 +01:00
conf: check to make sure logging block exists in config
This commit is contained in:
parent
5877031203
commit
584f952113
7
conf.py
7
conf.py
@ -50,16 +50,21 @@ testconf = {'bot':
|
|||||||
def validateConf(conf):
|
def validateConf(conf):
|
||||||
"""Validates a parsed configuration dict."""
|
"""Validates a parsed configuration dict."""
|
||||||
assert type(conf) == dict, "Invalid configuration given: should be type dict, not %s." % type(conf).__name__
|
assert type(conf) == dict, "Invalid configuration given: should be type dict, not %s." % type(conf).__name__
|
||||||
for section in ('bot', 'servers', 'login'):
|
|
||||||
|
for section in ('bot', 'servers', 'login', 'logging'):
|
||||||
assert conf.get(section), "Missing %r section in config." % section
|
assert conf.get(section), "Missing %r section in config." % section
|
||||||
|
|
||||||
for netname, serverblock in conf['servers'].items():
|
for netname, serverblock in conf['servers'].items():
|
||||||
for section in ('ip', 'port', 'recvpass', 'sendpass', 'hostname',
|
for section in ('ip', 'port', 'recvpass', 'sendpass', 'hostname',
|
||||||
'sid', 'sidrange', 'protocol', 'maxnicklen'):
|
'sid', 'sidrange', 'protocol', 'maxnicklen'):
|
||||||
assert serverblock.get(section), "Missing %r in server block for %r." % (section, netname)
|
assert serverblock.get(section), "Missing %r in server block for %r." % (section, netname)
|
||||||
|
|
||||||
assert type(serverblock.get('channels')) == list, "'channels' option in " \
|
assert type(serverblock.get('channels')) == list, "'channels' option in " \
|
||||||
"server block for %s must be a list, not %s." % (netname, type(serverblock['channels']).__name__)
|
"server block for %s must be a list, not %s." % (netname, type(serverblock['channels']).__name__)
|
||||||
|
|
||||||
assert type(conf['login'].get('password')) == type(conf['login'].get('user')) == str and \
|
assert type(conf['login'].get('password')) == type(conf['login'].get('user')) == str and \
|
||||||
conf['login']['password'] != "changeme", "You have not set the login details correctly!"
|
conf['login']['password'] != "changeme", "You have not set the login details correctly!"
|
||||||
|
|
||||||
return conf
|
return conf
|
||||||
|
|
||||||
def loadConf(fname, errors_fatal=True):
|
def loadConf(fname, errors_fatal=True):
|
||||||
|
Loading…
Reference in New Issue
Block a user