Commit 10c7b9e0 authored by Matt Traudt's avatar Matt Traudt Committed by juga
Browse files

Remove config.log.ini

parent f3a487bd
......@@ -24,9 +24,6 @@ def main(args, conf):
log.info('Creating %s', args.directory)
os.makedirs(args.directory, exist_ok=False)
# Create config.log.ini ####
touch_file(os.path.join(args.directory, 'config.log.ini'))
# Create config.ini ####
fname = os.path.join(args.directory, 'config.ini')
if os.path.exists(fname) and not os.path.isfile(fname):
......
......@@ -28,7 +28,7 @@ def main():
for e in conf_errors:
log.critical(e)
exit(1)
configure_logging(conf)
# configure_logging(conf)
def_args = [args, conf]
def_kwargs = {}
known_commands = {
......
......@@ -46,18 +46,6 @@ def _get_user_config(args, conf=None):
return conf
def _get_user_logging_config(args, conf=None):
if not conf:
conf = ConfigParser(interpolation=ExtendedInterpolation())
else:
assert isinstance(conf, ConfigParser)
fname = os.path.join(args.directory, 'config.log.ini')
if not os.path.isfile(fname):
return conf
conf = _read_config_file(conf, fname)
return conf
def _get_default_logging_config(args, conf=None):
if not conf:
conf = ConfigParser(interpolation=ExtendedInterpolation())
......@@ -73,7 +61,6 @@ def get_config(args):
conf = _get_default_config()
conf = _get_default_logging_config(args, conf=conf)
conf = _get_user_config(args, conf=conf)
conf = _get_user_logging_config(args, conf=conf)
return conf
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment