[tor-commits] [sbws/master] Remove config.log.ini

[pastly at torproject.org]

commit 10c7b9e0034a26c7f65948573724ea7723acf588
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Mon Jun 25 10:01:30 2018 -0400

    Remove config.log.ini
---
 sbws/core/init.py   |  3 ---
 sbws/sbws.py        |  2 +-
 sbws/util/config.py | 13 -------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/sbws/core/init.py b/sbws/core/init.py
index e7e839e..ea415a3 100644
--- a/sbws/core/init.py
+++ b/sbws/core/init.py
@@ -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):
diff --git a/sbws/sbws.py b/sbws/sbws.py
index b95f738..584ce02 100644
--- a/sbws/sbws.py
+++ b/sbws/sbws.py
@@ -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 = {
diff --git a/sbws/util/config.py b/sbws/util/config.py
index c24ac23..25df375 100644
--- a/sbws/util/config.py
+++ b/sbws/util/config.py
@@ -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